Code cleanup.

Creating new objects kinda works (WIP)