Fixes passing SystemState to pass reference to active instance.
Adds wrapper function for drawCircle
Implements remaining draw TODOs in mark.