Map movement is functional, reordered the state list and a few level variables.