Refactor into framework; Travis