ticket:1
Done ticket 1 with tests