Start refactoring things into smaller pieces