new domain model + work on sport plan