Implemented add/remove rule; remove not tested, add not working yet