Move the rest of the primitives over to the OO style
Render primitives from their object

I think I'm going to change this so that getTitle actually returns the geo objects -- this will cause some other short-term issues