interim commit to capture mid-refactoring
fix all the sick errors and builds again