Add basic models, make specs passed