challenge refactoring
Challenge tests work now. Lots of uglyhacks for the code to compile