finish up views and forms and tests, refactor the load from file a little bit