Merge Colby's UI and David's backend