This is a semi working update, it has prints that need to be removed. Kwamina fix the remove methods.