Commented out deleters.
Ya, this is good stuff
Merge remote-tracking branch 'origin/Seth' into Tom
Added destructors. Still loses memory. Fuck it.