start refactoring, old code was awful
finish pre-build refactoring, trying to build and writing a demo