Started working on the remove option