WIP slash tidy-up commit. Sloppy, sorry.