And so begins the tweaking of shit to make the travis build pass