About to commence heavy refactoring here