Finished add/remove classes

Still need to add update/edit later