New version is quite large so I'll put it in the code section rather than the snippets section.