#206 - Implemented the first pass happy path approach to cancel as undo for units