Yeah, if I have one problem with this pull request it's that I couldn't find better names for the Add/Remove methods. I cycled through a couple of things and couldn't find something that sounded right. Suggestions?