Travis added
Refactor to a better design