refactored models out to one file
saved tmp work