Work in progress
Getting ready for travis testing