More big changes

Some stuff a little broken
But local games are saved/restored on activity destroy