Woop woop halfway through rationalisation and refactoring