Tutorial progress based on moves. Massive code cleanup