Fix first line
Fix formatting
Phase 1 - reworked, test still fails
Make other files compileable