Fleshed out more of the model. Created test data.