Mass refactoring!
Changed the to a 2 stage process, the first being resolving a form (process) and the second being compiling en cleanup.