Set turn and phase into its own directive
Merge branch 'turn_and_phase'

* turn_and_phase:
  Set turn and phase into its own directive