Moved some more model things around.  Also partially added some functions that will need completed when a UX is more in place.