Travis 2

I hate the warnings. and I love the 'should' syntax :-(