Initial work on CompileCommand
Refactor
Simplify