WIP. Code cleanup.  Fixed bug in render_objects.  Deleted ContentBase class as not needed.