More data. Also slowly refactoring stuff to use the new model classes for proper pickling.