moving things into model #143

Closed gimpycoder closed 9 years ago