Have to look at this closer when time allows, removing travis