Feature/trello 8