Updated Models

Bad commit.  Some of this stuff will break stuff and stuff.