Separated into two activities, still have to move the code out of main
Fixed thread issue. Removed code from Main. Similar fixes around the rest of the codebase