Models

in progress. PR for code review only