new models

-new models
-some clean up