Lots of changes
working on getting all models setup correctly