Model development

Rudimentary model is done, we need to integrate it into the rest of what's been done to see if it works.