Got Remove working, started on Add