Intial version of hardgame activity and code cleanup