Classes all set
Add functions complete, working on remove