Making it all work together
Add travis config
Tidy up code