Started design for story 147

The design is still incomplete. 


Story: #147
Task: #334