Started refactoring activities to remove code duplication. Will need to adjust the UML as well, possibly.