move code around
general cleanup
give travis a go