More progress made on refactor. Potentially fixed Travis-CI builds. Commented out problem areas