refactored for some, added debug proxy handler and add/remove helper functionality