Move file around first
Second exercise on model refactored