Temporary version - does not commit
better clean up
Compiles - 25/52 tests succeeding