Models

Modified models and should be working.  Also Alan rocked some tests.  Whoot!