Started refactoring... doesn't compile

Just storing away work in progress