Updated model. Started with tests.