More tests passing. Almost done with the model