Added new main activity and pushed others down
broken version of refactor
close of play Thursday