Update to account for refactoring & redesign of main project