Mostly complete, push not opening to main activity