Finish implementation of CupCake.Command