chore(compiler): Move code around, preparing for refactor
chore(todo): Play with new syntax