Finished mod adding and removing (-o/+o) Might remove later. Not tested