Feature/trello 4