Work done for story trello_21