Starting to modify main loop for 2P - nothing broken yet