Adjusting the models.
Fixing Model to handle subclasses correctly.
Getting rid of old barrel refernces.