Closes #172 and orgs to the models  - attempt to see things from above, which functions are using (put) which models.