Adding one more model and cleaning up as we go - in the middle of it'