In the middle of a refactor.

I think I just need to let theocmpiler find all the issues and it should be back to working.