Better base class hierarchy. Fixed problem where content was being loaded too early.