More refactoring.

Still does not render. Wtf is going on now.