Updated the todo, travis implemented