Basic add/remove and some edit functions added.