#206 - Adding unit decrement behavior to cancel as undo