Started working on Command pattern