lots of changes to models etc.

getting late