Stage 3, Updates to Manager State, some debugging to be done