Still WIP but tests are now at least not failing (so travis active again)