Large scale refactoring of Gapify in order to begin working on watch functionality.