More cleaning up, more TODOs
More progress, 70% of the model factory compiling