Borked, started some refactoring.