Beginning refactor, pushing to test travis ci setup