Split new/partials in.
isn't exploding!
Clean up some bugs.