Added model classes to project
Removing stage 2 - need to re-create it.