[TASK] Updated Command class - closes #8