Re-added angle increment
Change draw-form to manipulate a state map
Cleaned up draw-form's recur
Pushing and popping state
Changed bad variable name