Feature/trello 6