Model Work

Work on fleshing out models and adding more classes.

Removed some things from being observable.