Down to 2 non-compiling source files