Merge lp:~ben-hutchings/endroid/roomowner into lp:endroid

[Ben Hutchings]

Merge in changes in prep for beta release.

__init__.py:
 - moved plugin initialisation/config loading to PluginManager
 - added command line argument to allow ssh access via manhole (disabled by default)

config.py -> confparser.py:
 - rewrote to be more flexible
 - reads an ini-like config file into a nested dictionary, providing a get method which permits wildcard search and or syntax
 - will automatically attempt to interpret config values as python objects

cron.py:
 - removed some commented code
 - some small code formatting changes

manhole.py:
 - provides a method of accessing endroids internals via ssh using twisted.conch (provides a python interpreter with access to the endroid class instance)

messagehandler.py:
 - added a Handler class which adds a couple of nice attributes as well as a function callback. Plugins now register a handler instance rather than just a function callback which is called via handler.callback()
 - chat callbacks are now registered against groupname rather than userjid - partly to be more similar to registering with rooms and partly because it reduces the size of the messagehandler._handlers dictionary if there are many users.
 - restructured the _handlers dictionary to be {group/room : {msg type : {category : [handlers]}}}
rather than {type : {category : {room/userjid :[ handlers]}}} (this was going to help with reloading plugins in a room/group but this feature hasn't been added)
 - removed the multitude of register_*_callback/filter methods - the general register_callback function is now called directly from the Plugin class

pluginmanager.py:
 - added access to usermanagement and messagehandler to the Plugin class
 - compressed the register_*_callback functions (the switch from registering plugins against groups rather than individual users helped here) and templated the doc strings which were all pretty much identical)
 - removed another plenitude of register_*_callback methods from pluginmanager - as previously mentioned, these registrations now go straight from the Plugin class to the messagehandlers register_callback function
 - added a reload() method which currently doesn't work but hopefully will be fixed to allow plugin reloading (it currently fails on plugins which dispatch callbacks to otherplugins such as CommandPlugin, httpinterface and patternmatcher)

blacklist.py:
 - Blacklist now maintains a class _blacklist set allowing it to act globally

invite.py
 - a command plugin used to invite a list of users to a list of rooms eg invite -u me -r all invites the user sending the message to all the rooms he is registered with

roomowner.py:
 - currently serves only to configure a room that it joins and do nothing else.
 - in the future will provide many more room-management features

rosterhandler.py:
 - added the (un)availableReceived methods to inform the usermanagement class who is online/present in rooms and groups
 - NOTE - plugins are currently unaware of changes to presence - an obvious next step would be to expand the rosterhandler class to add callback methods as messaghandler has.

usermanagement.py:
 - added the Roster class - this keeps track of the users registered with and present in a room or group, providing capabilities to call functions when users are registered or deregistered (used to subscribe to contacts added to endroid's contact list and add users to a room's member list when being registered with a room)
 - added the Room class - this is just a Roster with additional information enough to join a room potentially with a password. Also contains a default room configuration dictionary and a dictionary of available-to-user configuration options.
 - re-wrote the usermanagement class from scratch using the Room and Roster classes to facilitate things. Added a number of functions to get information about users in various locations. Also functions to join and configure rooms.
  - the join room function will retry a failed join assuming that someone has stolen its nickname (a temporary nickname will be generated to join the room and the offending user will be kicked)

wokkelhandler.py
 - userJoinedRoom/userLeftROom used to let usermanagement class know who's where

endroid2.graphxml
 - a class diagram of endroid

[Martin Morrison (isoschiz)]

Comments in the order the files appear in the diff:

src/endroid/__init__.py

- You've changed permissions on this file. Please revert! It shouldn't be executable

- In general, it's nice to keep the module name on foreign imports (e.g. things that come from twisted). "service.Application" is a lot more obvious than "Application". Revert that import in particular.

- Probably want to increment the version number of EnDroid. ;-)

- The fields on EnDroid itself are clearer in full: rosterhandler, wokkelhandler, messagehandler, usermanagement (rather than rh, wh, um, mh).

- The initialisation code has changed - although a lot of it appears to just be changes to the names of local variables, and not to functionality. Can you revert the lines that are unchanged, to make it easier to review.

(more comments to come)

[Ben Hutchings (ben-hutchings)]

Done the first four (in __init__.py)
As for the fifth - I've changed two lines back to how they were but
pretty much everything is different (I assume you're talking about the
code in startup_flow.)

Ben

PS do I just do another push to update the code?

On 29/07/2013 17:52, Martin Morrison wrote:
> Comments in the order the files appear in the diff:
>
> src/endroid/__init__.py
>
> - You've changed permissions on this file. Please revert! It shouldn't be executable
>
> - In general, it's nice to keep the module name on foreign imports (e.g. things that come from twisted). "service.Application" is a lot more obvious than "Application". Revert that import in particular.
>
> - Probably want to increment the version number of EnDroid. ;-)
>
> - The fields on EnDroid itself are clearer in full: rosterhandler, wokkelhandler, messagehandler, usermanagement (rather than rh, wh, um, mh).
>
> - The initialisation code has changed - although a lot of it appears to just be changes to the names of local variables, and not to functionality. Can you revert the lines that are unchanged, to make it easier to review.
>
> (more comments to come)

[Martin Morrison (isoschiz)]

Fair enough - the first 5 lines was what I looked at. ;-) You have also, of course, lost the awesome HHGG quote that gets logged when initialisation is complete...

Further comments:

- Might be worth censoring the manhole dict in practice. Pick the elements that are most useful, given your experience. Might also be worth having a whole separate module with some "helper functions" that get put into the manhole dict, to make it even more useful (at this stage, no need for the extra helpers, but deferring to a module that could set them up would be useful).

- Related: instead of listening for the manhole in this module, defer entirely to the manhole module (something like "start_manhole(args, droid)").

- __main__.py made executable - also not necessary.

configparser.py

- There are some "@@@" comments in the configparser. These should be converted into something more appropriate (like actual docstrings, or potentially bug reports/feature requests in launchpad).

- Line 421: typo (Pasrer).

- [Minor: method names should be underscore_separated and not camelCase (I know existing code is wrong: new code should follow the coding standards though)]

- This module (configparser) could do with some (a lot ;-)) of docstrings, in particular explaining the expected/supported syntax for section names and aliases.

- The get method can be made more efficient:

 . Don't create lots of intermediate lists. Use generator expressions instead, and add the if to the same generator expression. (you'll need to make it into a list at the end)
 . Instead of the nested try statements, use simpler if statements. It makes the code a bit clearer.
 . A few newlines wouldn't go amiss. Some use of kwargs.pop(key, None) would also save the trys.
 . Why are the copies shallow? What if the value contains a list or dict?

- Parser.splitter should probably be Parser.SPLITTER (effectively a constant)

cron.py

- Lots of whitespace changes, without any real content. A good opportunity to improve more docstrings. ;-)

manhole.py

- def manhole_factory. Or, better, change to start_manhole as mentioned above.

- Comment about changing perhaps should be removed? For now, I think this is fine.

messagehandler.py

- Also executable (I'll stop adding this comment. Please fix all files)

- Use of im_self in the Handler class is dangerous! Assumes that plugins will only ever pass *methods* of *themselves* - both of which can quite easily not be true. This needs removing.

- The way handlers are now stored, they don't sort by priority! This is bad. Needs reverting (either by pulling priority out of the Handler object, or by doing extra work in that class to make it sort correctly).

- You've reordered the dicts in the handlers storage - why? Just means all the functions have to change.

- Apart from a rename of 'mtype' to 'place', send() and reply() are identical. Why make them look so changed? :-)

- You've altered the constructor of Message - why? Just means more changes everywhere that we create them.

- Inside the Message class, you've made __handlers not private anymore - why is that? Probably wants to be private again. Also this forms part of the external API, and is used by Comman...

[Ben Hutchings (ben-hutchings)]

A few comments:

On 29/07/2013 23:27, Martin Morrison wrote:
> Fair enough - the first 5 lines was what I looked at. ;-) You have also, of course, lost the awesome HHGG quote that gets logged when initialisation is complete...
The HHGG quote was nice but when room configuration moved to a plugin it
tended to fire before everything was configured so wasn't really
accurate any more.
> Further comments:
>
> - Might be worth censoring the manhole dict in practice. Pick the elements that are most useful, given your experience. Might also be worth having a whole separate module with some "helper functions" that get put into the manhole dict, to make it even more useful (at this stage, no need for the extra helpers, but deferring to a module that could set them up would be useful).
I've censored the manhole dict a bit and moved some more stuff into
manhole.py - not sure if this is what you meant but there should be room
to add helper functions in manhole.py now
> - Related: instead of listening for the manhole in this module, defer entirely to the manhole module (something like "start_manhole(args, droid)").
>
> - __main__.py made executable - also not necessary.
>
> configparser.py
>
> - There are some "@@@" comments in the configparser. These should be converted into something more appropriate (like actual docstrings, or potentially bug reports/feature requests in launchpad).
>
> - Line 421: typo (Pasrer).
>
> - [Minor: method names should be underscore_separated and not camelCase (I know existing code is wrong: new code should follow the coding standards though)]
>
> - This module (configparser) could do with some (a lot ;-)) of docstrings, in particular explaining the expected/supported syntax for section names and aliases.
>
> - The get method can be made more efficient:
>
> . Don't create lots of intermediate lists. Use generator expressions instead, and add the if to the same generator expression. (you'll need to make it into a list at the end)
I tried to make the list comprehension into a generator expression in
the .get method but I just got empy lists back - not entirely sure why
at the moment, will have more of a look this afternoon.
> . Instead of the nested try statements, use simpler if statements. It makes the code a bit clearer.
> . A few newlines wouldn't go amiss. Some use of kwargs.pop(key, None) would also save the trys.
> . Why are the copies shallow? What if the value contains a list or dict?
>
> - Parser.splitter should probably be Parser.SPLITTER (effectively a constant)
>
> cron.py
>
> - Lots of whitespace changes, without any real content. A good opportunity to improve more docstrings. ;-)
>
> manhole.py
>
> - def manhole_factory. Or, better, change to start_manhole as mentioned above.
>
> - Comment about changing perhaps should be removed? For now, I think this is fine.
>
> messagehandler.py
>
> - Also executable (I'll stop adding this comment. Please fix all files)
>
> - Use of im_self in the Handler class is dangerous! Assumes that plugins will only ever pass *methods* of *themselves* - both of which can quite easily not be true. This needs removing.
>
> - The way handlers are now stored, they don't sort by...

[lp:~ben-hutchings/endroid/roomowner]

54. By Ben Hutchings on 2013-07-31

- Reverted ordering of messagehandler's _handler dictionary
- Fixed some more file permissions

55. By Ben Hutchings on 2013-08-01

cron: renamed parameters fun_name and name to reg_name for consitency. Renamed field name fun_name to reg_name. (it seemed strange having three different names for the same thing while writing up the API)

messagehandler: added a couple of comments in do_callback, noting that if a plugin is registered in multiple user groups it may get called multiple times.

usermanagement: renamed get_registered_users to get_users for consistency with the rest of the get_ functions

56. By Ben Hutchings on 2013-08-01

- rolled back some name changes (will be in seperate branch)
- removed an unused method (prepare_response) from messagehandler
- removed reload method from pluginmanager as it doesn't work

- fixed permissions again

[Martin Morrison (isoschiz)]

Minor point throughout the diff: lines shouldn't exceed 80 characters. There are a few places where new lines of code do. It would be good to wrap them as per the coding standards.

endroid/__init__.py

- It is interesting that you have moved the initial joining of rooms out of wokkelhandler and in to EnDroid main itself. I guess the main consequence of this is that we now call .join() before even having reached connected state. So my question is: does this also mean that we now don't re-join rooms after a disconnection?

- Above the "get_pm()" inner func in the main init is a comment that refers to rooms, when the function is used for both rooms and groups. Also the function might be better named "start_pluginmanager".

- The Twisted logging functionality should probably be predicated on a command line or configuration option.

cron.py

- Comment applies elsewhere too, but in CronSing the docstring formatting needs changing to:

"""
First line of text.
More lines.

"""

i.e. open quotes on one line, text on their own lines, and then a blank line before the line containing close quotes. Note that single line docstrings can remaing single line: """Single line text"""

messagehandler.py

- Handler has a "plugin" field that is unused.

- Instead of having the PRIORITY constants being global and then copying them into each instance of MessageHandler, make them class fields of MessageHandler itself (and every instance can see them "for free").

- In do_callback(), minor wording change: it says "if the same plugin is registered for two groups, it will be called twice". This isn't clear on the fact that different *instances* of the Plugin will be called, once in each "context" (i.e. group).

- Same function, might be worth abstracting the concept of "active names" so that the same code can handle both rooms and chat. By abstract, I mean "move into usermanagement" - because that is where this kind of logic belongs (messagehandler doesn't want to faff with these kinds of specifics).

- You removed "prepare_response()". Any reason? It was intended to be a shortcut to creating a new Message() object.

Actually, now that I think about it, maybe what would be good is if plugins could do:

self.messagehandler.Message(to, msg)

i.e. a method called "Message" on the messagehandler that wraps the Message constructor by passing in the right MessageHandler and being generally helpful where it can. Thoughts?

pluginmanager.py

- I think this is a general comment, but "room" and "group" are magic strings - i.e. enums. Would be good to define constants for them somewhere (probably usermanagement.py?)

- Maybe not for this diff, but the pluginmanager APIs should also be moved behind a self.pluginmanager object (e.g. list_plugins)

blacklist.py

- get_blacklist can be marked as a @classmethod

- You've changed from discard() to remove(). This means you'll now throw exceptions if things get a little out of sync. Probably best to keep it as discard().

invite.py

- Lacks a help string.

- You've made the commands quite... commandliney. Wouldn't it be nicer to use more English language-style commands, like the other plugins (see pubpicker!) e.g. invite {me|all|<name>+}...

[Ben Hutchings (ben-hutchings)]

I had a chat with Chuck about this earlier.

Mainly it went because it was only being used by the hi5 plugin in a way
that was just a more verbose version of self.messagehandler.send_chat.

On the whole, why would a plugin need to create such a message object
outside of a .send or .reply function of some kind? The only thing you
could ultimately do with the message is send it and we already have an
API for that.

Ben

On 01/08/2013 17:11, Martin Morrison wrote:
> - You removed "prepare_response()". Any reason? It was intended to be a shortcut to creating a new Message() object.
>
> Actually, now that I think about it, maybe what would be good is if plugins could do:
>
> self.messagehandler.Message(to, msg)
>
> i.e. a method called "Message" on the messagehandler that wraps the Message constructor by passing in the right MessageHandler and being generally helpful where it can. Thoughts?

[lp:~ben-hutchings/endroid/roomowner]

57. By Ben Hutchings on 2013-08-02

- Made all changes in second half of diff notes with a couple of exceptions:
  - formatting changes (line wrap, multiline comments etc) will be done in a different diff.
  - the logic in messagehandler's do_callback method relating to rooms and groups is still there, though it should probably be moved to usermanagement at some point
  - prepare_response is still gone

58. By Ben Hutchings on 2013-08-02

- fixed room memberships (this was failing as a result of the configuration not being set properly due to a roomconfig_roomsecret parameter being passed (as None) with roomconfig_passwordprotectedroom as False) Both the configuraiton problem and the lack of an error message have been fixed.

59. By Ben Hutchings on 2013-08-05

- Users using multiple resources now seems to work fine
- Invite plugin gives more helpful error messages

60. By Ben Hutchings on 2013-08-05

- made the diff changes (added some comments/docstrings, changed a couple of names)

61. By Ben Hutchings on 2013-08-06

- renamed the usermanagement get_user_* functions to get_* (this accounts for changes in many files)
- removed some unused imports
- added some docstrings

- fixed friending/unfriending behaviour (note: this required updating wokkel to the latest version)

62. By Ben Hutchings on 2013-08-06

- fixed chat filters in usermanagement (was previously looking up a user jid rather than group names)
- added a broadcast plugin which uses filters to send endroid's messages to all available resources if a user wants.

63. By Ben Hutchings on 2013-08-06

- actually added broadcast plugin
- got rid of someunnecessary logging in messagehandler
- fixed a couple of typos/copy/paste errors in messagehandler

64. By Ben Hutchings on 2013-08-06

- made the diff changes
- a couple of doc-string modifications
- fixed some small 'bugs' in message.reply methods

65. By Ben Hutchings on 2013-08-06

- Changed some comments, added some helphints in broadcast plugin
- Updated the wokkel egg and dependency list to version 0.7.1
- Updated the sample config file to the new format
- Added the endroid_echo script to bin

66. By Ben Hutchings on 2013-08-06

- reverted contact details in conf file

67. By Ben Hutchings on 2013-08-07

- Fixed a potential bug in Cron whereby a KeyError could be raised after a restart of Endroid when Cron attempts to call a function which is no longer in its registration dictionary.
- Added getAtTimes and getTimeouts to cron which display functions schedule with doAtTime and setTimeout respectively.

68. By Ben Hutchings on 2013-08-07

- Changed a work in messagehandlers do_callback logging so that the log feedback actually makes sense (it is printed in reverse but was refereed to in the present rather than past tense)

69. By Ben Hutchings on 2013-08-07

- Added removeTask(reg_name) method to Cron which will delete all entries in the database matching reg_name
- register now has a persistent option which if False, calls removeTask before registering the function.

70. By Ben Hutchings on 2013-08-08

- Some parameter name and docstring changes as suggested by the doc review.
- Added the passthebomb plugin

71. By Ben Hutchings on 2013-08-08

- Updated the example config file
- Updated the endroid.sh script
- nick, groups and rooms are now optional in the config file
- staticmethods -> classmethods in Passthebomb plugin where appropriate

72. By Ben Hutchings on 2013-08-08

- changed 'name' paramaters to 'user' in some of usermanagement's get_ functions.
- added times to the console log in __init__

73. By Ben Hutchings on 2013-08-08

- updated endroid.install to use the latest version of wokkel

[Martin Morrison (isoschiz)]

Looking pretty good now! A few comments below, but nothing major.

bin/endroid:

- Given we are frigging with the PYTHONPATH anyway, we should add "~/.endroid/plugins/" to it, *before* the /usr/lib/ entry.

- This can also change to python -m endroid now that we have __main__.py

endroid.conf

- The plugins were/are listed alphabetically. Move roomowner to the right place.

- There's a missing newline at the end of the file

- It's odd to have example roomowner plugin config in here, but no other plugins. Probably move this to the roomowner docs instead.

setup.py

- This file wants to keep its +x permissions ;-)

endroid/__init__.py

- Line 2026 can go (extra LOGGING_FORMAT)

- Logging for groups and rooms is noisy (many lines). Simple change to ", ".join(rooms) will improve that.

endroid/confparser.py

- The literal_eval thing is cool. Except when it comes to bools. This should be made clear in the docstring.

- get() doesn't need to take arbitrary kwargs. If it does though, it should verify that it doesn't get any unexpected ones (swallowing get("foo", defult=True) silently is Evil)

cron.py

- The description of cron in the docstring is a bit misleading. Need to be explicit that .register() returns a Task object on which the later funcs can be called.

- There's no real need to change the table field name from fun_name to reg_name (even if it is more accurate). It just makes it not backwards compatible. Revert this.

- Docstring on register is not formatted correctly. It also doesn't really explain that it returns a Task object that can be used to get the callback called in the future.

- In removeTask instead of pop, use del.

database.py

- Database docstring not formatted correctly.

manhole.py

- start_manhole docstring not formatted correctly.

blacklist.py

- The get_blacklist() method is superfluous. Can get rid of it and access _blacklist directly

- Use discard instead of remove (list 3839)

broadcast.py

- Think this should be added separately in a different branch.

invite.py

- Plugin should be named Invite to be consistent!

- Helphints need the command keywords removing (they are already added by Command)

rosterhandler.py

- in purge_roster (in connectionInitialized) no need to pass self through - it's a closure with access to that anyway.

- You've added a set_available() method that does nothing. Remove it again.

usermanagement.py

- The default roomname shouldn't be Ensoft. EnDroid would do.

[Ben Hutchings (ben-hutchings)]

I'll do the doc changes in a separate branch.
Also the plugin enhancements (as they all work now I want to avoid
changing too many things).

Comments inline.

On 10/08/2013 22:12, Martin Morrison wrote:
>
> endroid/__init__.py
>
> - Line 2026 can go (extra LOGGING_FORMAT)
>
> - Logging for groups and rooms is noisy (many lines). Simple change to ", ".join(rooms) will improve that.
Will put on wiki page as an enhancement.
> endroid/confparser.py
>
> - The literal_eval thing is cool. Except when it comes to bools. This should be made clear in the docstring.
Will do in docs branch
> - get() doesn't need to take arbitrary kwargs. If it does though, it should verify that it doesn't get any unexpected ones (swallowing get("foo", defult=True) silently is Evil)
Not sure how best to do this. Will put in bugs section on wiki.
> cron.py
>
> - The description of cron in the docstring is a bit misleading. Need to be explicit that .register() returns a Task object on which the later funcs can be called.
Docs branch
>
> - There's no real need to change the table field name from fun_name to reg_name (even if it is more accurate). It just makes it not backwards compatible. Revert this.
It just makes things consistent. (Rather than having conditions like
{'fun_name' : reg_name} which make things harder to understand in an
already confusing module...

(And I thought we were going to start over with a clean database anyway?)
>
> - Docstring on register is not formatted correctly. It also doesn't really explain that it returns a Task object that can be used to get the callback called in the future.
>
> - In removeTask instead of pop, use del.
>
> database.py
>
> - Database docstring not formatted correctly.
>
> manhole.py
In doc branch
>
> - start_manhole docstring not formatted correctly.
>
> blacklist.py
>
> - The get_blacklist() method is superfluous. Can get rid of it and access _blacklist directly
>
> - Use discard instead of remove (list 3839)
These can be done in a seperate plugin enhancement branch
>
> broadcast.py
>
> - Think this should be added separately in a different branch.
Will do
>
> invite.py
>
> - Plugin should be named Invite to be consistent!
>
> - Helphints need the command keywords removing (they are already added by Command)
Again in separate plugin branch
>
> rosterhandler.py
>
> - in purge_roster (in connectionInitialized) no need to pass self through - it's a closure with access to that anyway.
>
> - You've added a set_available() method that does nothing. Remove it again.
>
> usermanagement.py
>
> - The default roomname shouldn't be Ensoft. EnDroid would do.
Done
Ben

[lp:~ben-hutchings/endroid/roomowner]

74. By Ben Hutchings on 2013-08-12

-fixed plugins not working in rooms (this came from a name conflict in usermanagement.get_nickname)
-fixed potential bug in wokkelhandler.receivedGroupChat which would occur if a resource was specified as part of the jid in the config file.

-updated blacklist and ratelimit to use the self.cron rather than Cron().get() API.

-config "pconfig" section name is now "plugin"

75. By Ben Hutchings on 2013-08-12

-actually fixed ratelimit and blacklist (and a 'bug' in ratelimit caused by the get_userhost method in usermanagement not dealing with getting a non-string item.)

-updated config file
-removed broadcast plugin to be added in another branch

-other markup notes will be put on wiki/done in different diffs

76. By Ben Hutchings on 2013-08-12

-merged slimey's fixes

77. By Ben Hutchings on 2013-08-12

-merged in memo plugin fixes + command decorator

78. By Ben Hutchings on 2013-08-12

-merged invite help fixes

79. By Chris Davidson <email address hidden> on 2013-08-12

Fix some issues with the command changes also, handle messages from groups more gracefully

80. By Chris Davidson <email address hidden> on 2013-08-12

Another command fix

81. By Ben Hutchings on 2013-08-12

-fixed a bug in configparser by which sections of config could be overwritten by subsequent sections

[Martin Morrison (isoschiz)]

review: Approve

=== modified file 'bin/endroid'
--- bin/endroid	2012-08-02 10:49:57 +0000
+++ bin/endroid	2013-08-12 17:50:48 +0000
@@ -1,2 +1,2 @@
 #!/bin/sh
-PYTHONPATH="/usr/lib/endroid/dependencies/wokkel-0.7.0-py2.7.egg":"/usr/lib/endroid/plugins":"${PYTHONPATH}" python -c "import endroid; endroid.main()" $@
+PYTHONPATH="~/.endroid/plugins/":"/usr/lib/endroid/dependencies/wokkel-0.7.1-py2.7.egg":"/usr/lib/endroid/plugins":"${PYTHONPATH}" python -m endroid $@

=== added file 'bin/endroid_echo'
--- bin/endroid_echo	1970-01-01 00:00:00 +0000
+++ bin/endroid_echo	2013-08-12 17:50:48 +0000
@@ -0,0 +1,39 @@
+#!/usr/bin/python
+
+import os
+import sys
+import urllib
+
+KEY_ENV_VAR = 'ENDROID_REMOTE_KEY'   # eg XACKJAASKJDAHD
+JID_ENV_VAR = 'ENDROID_REMOTE_USER'  # eg [e-mail]
+URL_ENV_VAR = 'ENDROID_REMOTE_URL'   # eg http://127.0.0.1:8880/remote/
+
+class UserError(Exception):
+    pass
+
+try:
+    if len(sys.argv) < 2:
+        raise UserError("Usage: %s <Message>" % sys.argv[0])
+
+    if JID_ENV_VAR not in os.environ:
+        raise UserError("Target user env var (%s) not set" % JID_ENV_VAR)
+
+    if KEY_ENV_VAR not in os.environ:
+        raise UserError("Message key env var (%s) not set" % KEY_ENV_VAR)
+
+    if URL_ENV_VAR not in os.environ:
+        raise UserError("Endroid URL env var (%s) not set" % URL_ENV_VAR)
+        
+    params = {'user': os.environ[JID_ENV_VAR],
+              'key': os.environ[KEY_ENV_VAR],
+              'message': ' '.join(sys.argv[1:])}
+
+    f = urllib.urlopen(os.environ[URL_ENV_VAR], urllib.urlencode(params))
+    for line in f.readlines():
+        line = line.strip()
+        if "Error:" in line:
+            print line
+
+except UserError as e:
+    print e
+

=== modified file 'debian/endroid.install'
--- debian/endroid.install	2012-09-02 20:45:27 +0000
+++ debian/endroid.install	2013-08-12 17:50:48 +0000
@@ -1,4 +1,5 @@
 etc/endroid.conf etc/endroid/
 etc/init/endroid.conf etc/init/
 bin/endroid usr/bin/
-lib/wokkel-0.7.0-py2.7.egg usr/lib/endroid/dependencies
+bin/endroid_echo usr/bin/
+lib/wokkel-0.7.1-py2.7.egg usr/lib/endroid/dependencies

=== modified file 'etc/endroid.conf' (properties changed: -x to +x)
--- etc/endroid.conf	2012-09-02 21:40:31 +0000
+++ etc/endroid.conf	2013-08-12 17:50:48 +0000
@@ -1,26 +1,54 @@
+# Comments will be ignored provided the hash is in the first column
+
 [Setup]
 jid = [e-mail]/planet
-secret = secret
-nick = Marvin
-
-plugins =
+password = secret
+# EnDroid's default nickname, defaults to the part of jid before the @
+# nick = Marvin
+
+# EnDroid's full contact list. Users on this list will be added as friends,
+# users not on this list will be removed from contacts and will be unable
+# to communicate with EnDroid.
+users=
+
+# What rooms EnDroid will attempt to create and join. Defaults to []
+# rooms = [e-mail],
+
+# What usergroup EnDroid will register plugins with. Defaults to 'all,'
+# groups = all, admins
+
+# Detailed logging will be kept here - if something goes wrong and does not
+# display an error in the console, look here.
+logfile=
+    ~/.endroid/endroid.log
+
+[Database]
+dbfile=/var/lib/endroid/db/endroid.db
+
+# This list of settings will be applied in groups and rooms with any name (*)
+[ group | room : *]
+plugins=
+# the roomowner plugin is necessary for room configuration to take place
+  endroid.plugins.roomowner
+# helper plugins depended on by others
+  endroid.plugins.command
+  endroid.plugins.httpinterface
+  endroid.plugins.patternmatcher
+# management plugins
   endroid.plugins.blacklist
+  endroid.plugins.help
+  endroid.plugins.ratelimit
+  endroid.plugins.unhandled
+  endroid.plugins.whosonline
+# others
   endroid.plugins.chuck
-  endroid.plugins.command
   endroid.plugins.compute
   endroid.plugins.coolit
   endroid.plugins.correct
-  endroid.plugins.echobot
-  endroid.plugins.help
   endroid.plugins.memo
-  endroid.plugins.patternmatcher
-  endroid.plugins.pubpicker
-  endroid.plugins.ratelimit
   endroid.plugins.speak
-  endroid.plugins.spell
   endroid.plugins.theyfightcrime
-  endroid.plugins.unhandled
-  endroid.plugins.whosonline
+#  endroid.plugins.echobot  # this spams everywhere
 
 users=
 rooms=
@@ -28,6 +56,24 @@
 [Database]
 dbfile=/var/lib/endroid/db/endroid.db
 
-[UserGroup:*]
-
-[Room:*]
+[group:*]
+
+[room:*]
+
+# HTTP remote messaging feature (via 'httpinterface' and 'remote' plugins)
+#
+# port is the port (defaults to 8880)
+# interface is the interface (defaults to 127.0.0.1, ie accessible only
+# from the local host. Set to 0.0.0.0 to enable access from anywhere).
+
+[ group | room : * : plugin : endroid.plugins.httpinterface ]
+#port = 8881
+#interface = 0.0.0.0
+
+
+# Wolfram Alpha compute plugin. Get an API key for free at
+# https://developer.wolframalpha.com/portal/apisignup.html
+# and then put it below - good for 2000 free queries/month.
+
+[ group | room : * : plugin : endroid.plugins.compute ]
+#api_key = 123ABC-DE45FGJIJK

=== removed file 'lib/wokkel-0.7.0-py2.7.egg'
Binary files lib/wokkel-0.7.0-py2.7.egg	2012-08-02 10:49:57 +0000 and lib/wokkel-0.7.0-py2.7.egg	1970-01-01 00:00:00 +0000 differ
=== added file 'lib/wokkel-0.7.1-py2.7.egg'
Binary files lib/wokkel-0.7.1-py2.7.egg	1970-01-01 00:00:00 +0000 and lib/wokkel-0.7.1-py2.7.egg	2013-08-12 17:50:48 +0000 differ
=== added file 'src/endroid.graphml'
--- src/endroid.graphml	1970-01-01 00:00:00 +0000
+++ src/endroid.graphml	2013-08-12 17:50:48 +0000
@@ -0,0 +1,1841 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<graphml xmlns="http://graphml.graphdrawing.org/xmlns" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:y="http://www.yworks.com/xml/graphml" xmlns:yed="http://www.yworks.com/xml/yed/3" xsi:schemaLocation="http://graphml.graphdrawing.org/xmlns http://www.yworks.com/xml/schema/graphml/1.1/ygraphml.xsd">
+  <!--Created by yFiles for Java 2.11-->
+  <key for="graphml" id="d0" yfiles.type="resources"/>
+  <key for="port" id="d1" yfiles.type="portgraphics"/>
+  <key for="port" id="d2" yfiles.type="portgeometry"/>
+  <key for="port" id="d3" yfiles.type="portuserdata"/>
+  <key attr.name="url" attr.type="string" for="node" id="d4"/>
+  <key attr.name="description" attr.type="string" for="node" id="d5"/>
+  <key for="node" id="d6" yfiles.type="nodegraphics"/>
+  <key attr.name="Description" attr.type="string" for="graph" id="d7"/>
+  <key attr.name="url" attr.type="string" for="edge" id="d8"/>
+  <key attr.name="description" attr.type="string" for="edge" id="d9"/>
+  <key for="edge" id="d10" yfiles.type="edgegraphics"/>
+  <graph edgedefault="directed" id="G">
+    <data key="d7"/>
+    <node id="n0" yfiles.foldertype="group">
+      <data key="d4"/>
+      <data key="d6">
+        <y:ProxyAutoBoundsNode>
+          <y:Realizers active="0">
+            <y:GroupNode>
+              <y:Geometry height="248.99004051482336" width="105.0" x="239.42528205128247" y="244.97959073517745"/>
+              <y:Fill color="#F5F5F5" transparent="false"/>
+              <y:BorderStyle color="#000000" type="dashed" width="1.0"/>
+              <y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="22.37646484375" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="105.0" x="0.0" y="0.0">utilities</y:NodeLabel>
+              <y:Shape type="roundrectangle"/>
+              <y:State closed="false" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
+              <y:Insets bottom="15" bottomF="15.0" left="15" leftF="15.0" right="15" rightF="15.0" top="15" topF="15.0"/>
+              <y:BorderInsets bottom="0" bottomF="0.0" left="0" leftF="0.0" right="0" rightF="0.0" top="0" topF="0.0"/>
+            </y:GroupNode>
+            <y:GroupNode>
+              <y:Geometry height="50.0" width="50.0" x="0.0" y="60.0"/>
+              <y:Fill color="#F5F5F5" transparent="false"/>
+              <y:BorderStyle color="#000000" type="dashed" width="1.0"/>
+              <y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="22.37646484375" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="59.02685546875" x="-4.513427734375" y="0.0">Folder 8</y:NodeLabel>
+              <y:Shape type="roundrectangle"/>
+              <y:State closed="true" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
+              <y:Insets bottom="5" bottomF="5.0" left="5" leftF="5.0" right="5" rightF="5.0" top="5" topF="5.0"/>
+              <y:BorderInsets bottom="0" bottomF="0.0" left="0" leftF="0.0" right="0" rightF="0.0" top="0" topF="0.0"/>
+            </y:GroupNode>
+          </y:Realizers>
+        </y:ProxyAutoBoundsNode>
+      </data>
+      <graph edgedefault="directed" id="n0:">
+        <node id="n0::n0">
+          <data key="d5"><![CDATA[Owned by Endroid]]></data>
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="40.0" width="75.0" x="254.42528205128247" y="383.3142466346162"/>
+              <y:Fill color="#3366FF" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="55.369140625" x="9.8154296875" y="10.6494140625">Database<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="rectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+        <node id="n0::n1">
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="40.0" width="75.0" x="254.42528205128247" y="438.9696312500008"/>
+              <y:Fill color="#FFCC00" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="30.009765625" x="22.4951171875" y="10.6494140625">Cron<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="rectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+        <node id="n0::n2">
+          <data key="d5"><![CDATA[Owned by Endroid]]></data>
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="40.0" width="75.0" x="254.42528205128247" y="332.83515110677183"/>
+              <y:Fill color="#3366FF" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="39.34375" x="17.828125" y="10.6494140625">Parser<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="rectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+        <node id="n0::n3">
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="40.0" width="75.0" x="254.42528205128247" y="282.35605557892745"/>
+              <y:Fill color="#3366FF" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="50.03125" x="12.484375" y="10.6494140625">Manhole<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="rectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+      </graph>
+    </node>
+    <node id="n1" yfiles.foldertype="group">
+      <data key="d4"/>
+      <data key="d6">
+        <y:ProxyAutoBoundsNode>
+          <y:Realizers active="0">
+            <y:GroupNode>
+              <y:Geometry height="586.2619894030446" width="592.9340000000002" x="442.2021732772431" y="10.113173046875175"/>
+              <y:Fill color="#F5F5F5" transparent="false"/>
+              <y:BorderStyle color="#000000" type="dashed" width="1.0"/>
+              <y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="22.37646484375" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="592.9340000000002" x="0.0" y="0.0">Endroid Core</y:NodeLabel>
+              <y:Shape type="roundrectangle"/>
+              <y:State closed="false" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
+              <y:Insets bottom="15" bottomF="15.0" left="15" leftF="15.0" right="15" rightF="15.0" top="15" topF="15.0"/>
+              <y:BorderInsets bottom="0" bottomF="0.0" left="0" leftF="0.0" right="0" rightF="0.0" top="0" topF="0.0"/>
+            </y:GroupNode>
+            <y:GroupNode>
+              <y:Geometry height="50.0" width="50.0" x="0.0" y="60.0"/>
+              <y:Fill color="#F5F5F5" transparent="false"/>
+              <y:BorderStyle color="#000000" type="dashed" width="1.0"/>
+              <y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="22.37646484375" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="59.02685546875" x="-4.513427734375" y="0.0">Folder 9</y:NodeLabel>
+              <y:Shape type="roundrectangle"/>
+              <y:State closed="true" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
+              <y:Insets bottom="5" bottomF="5.0" left="5" leftF="5.0" right="5" rightF="5.0" top="5" topF="5.0"/>
+              <y:BorderInsets bottom="0" bottomF="0.0" left="0" leftF="0.0" right="0" rightF="0.0" top="0" topF="0.0"/>
+            </y:GroupNode>
+          </y:Realizers>
+        </y:ProxyAutoBoundsNode>
+      </data>
+      <graph edgedefault="directed" id="n1:">
+        <node id="n1::n0" yfiles.foldertype="group">
+          <data key="d4"/>
+          <data key="d6">
+            <y:ProxyAutoBoundsNode>
+              <y:Realizers active="0">
+                <y:GroupNode>
+                  <y:Geometry height="152.87646484375" width="252.09200000000033" x="457.2021732772431" y="276.0466120793269"/>
+                  <y:Fill color="#F5F5F5" transparent="false"/>
+                  <y:BorderStyle color="#000000" type="dashed" width="1.0"/>
+                  <y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="22.37646484375" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="252.09200000000033" x="0.0" y="0.0">usermanagement.py</y:NodeLabel>
+                  <y:Shape type="roundrectangle"/>
+                  <y:State closed="false" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
+                  <y:Insets bottom="15" bottomF="15.0" left="15" leftF="15.0" right="15" rightF="15.0" top="15" topF="15.0"/>
+                  <y:BorderInsets bottom="0" bottomF="0.0" left="0" leftF="0.0" right="0" rightF="0.0" top="0" topF="0.0"/>
+                </y:GroupNode>
+                <y:GroupNode>
+                  <y:Geometry height="50.0" width="50.0" x="0.0" y="60.0"/>
+                  <y:Fill color="#F5F5F5" transparent="false"/>
+                  <y:BorderStyle color="#000000" type="dashed" width="1.0"/>
+                  <y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="22.37646484375" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="59.02685546875" x="-4.513427734375" y="0.0">Folder 1</y:NodeLabel>
+                  <y:Shape type="roundrectangle"/>
+                  <y:State closed="true" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
+                  <y:Insets bottom="5" bottomF="5.0" left="5" leftF="5.0" right="5" rightF="5.0" top="5" topF="5.0"/>
+                  <y:BorderInsets bottom="0" bottomF="0.0" left="0" leftF="0.0" right="0" rightF="0.0" top="0" topF="0.0"/>
+                </y:GroupNode>
+              </y:Realizers>
+            </y:ProxyAutoBoundsNode>
+          </data>
+          <graph edgedefault="directed" id="n1::n0:">
+            <node id="n1::n0::n0">
+              <data key="d5"><![CDATA[Owned by Endroid]]></data>
+              <data key="d6">
+                <y:ShapeNode>
+                  <y:Geometry height="59.0" width="123.00000000000011" x="571.2941732772433" y="335.352"/>
+                  <y:Fill color="#3366FF" transparent="false"/>
+                  <y:BorderStyle color="#000000" type="line" width="1.0"/>
+                  <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="99.37890625" x="11.810546875" y="20.1494140625">UserManagement<y:LabelModel>
+                      <y:SmartNodeLabelModel distance="4.0"/>
+                    </y:LabelModel>
+                    <y:ModelParameter>
+                      <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                    </y:ModelParameter>
+                  </y:NodeLabel>
+                  <y:Shape type="rectangle"/>
+                </y:ShapeNode>
+              </data>
+            </node>
+            <node id="n1::n0::n1">
+              <data key="d6">
+                <y:ShapeNode>
+                  <y:Geometry height="40.0" width="58.0" x="472.2021732772431" y="373.9230769230769"/>
+                  <y:Fill color="#FFCC00" transparent="false"/>
+                  <y:BorderStyle color="#000000" type="line" width="1.0"/>
+                  <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="36.009765625" x="10.9951171875" y="10.6494140625">Room<y:LabelModel>
+                      <y:SmartNodeLabelModel distance="4.0"/>
+                    </y:LabelModel>
+                    <y:ModelParameter>
+                      <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                    </y:ModelParameter>
+                  </y:NodeLabel>
+                  <y:Shape type="rectangle"/>
+                </y:ShapeNode>
+              </data>
+            </node>
+            <node id="n1::n0::n2">
+              <data key="d6">
+                <y:ShapeNode>
+                  <y:Geometry height="40.0" width="58.0" x="472.2021732772431" y="313.4230769230769"/>
+                  <y:Fill color="#FFCC00" transparent="false"/>
+                  <y:BorderStyle color="#000000" type="line" width="1.0"/>
+                  <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="39.34375" x="9.328125" y="10.6494140625">Roster<y:LabelModel>
+                      <y:SmartNodeLabelModel distance="4.0"/>
+                    </y:LabelModel>
+                    <y:ModelParameter>
+                      <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                    </y:ModelParameter>
+                  </y:NodeLabel>
+                  <y:Shape type="rectangle"/>
+                </y:ShapeNode>
+              </data>
+            </node>
+          </graph>
+        </node>
+        <node id="n1::n1" yfiles.foldertype="group">
+          <data key="d4"/>
+          <data key="d6">
+            <y:ProxyAutoBoundsNode>
+              <y:Realizers active="0">
+                <y:GroupNode>
+                  <y:Geometry height="111.37646484375" width="254.84199999999998" x="765.2941732772433" y="297.97553515625"/>
+                  <y:Fill color="#F5F5F5" transparent="false"/>
+                  <y:BorderStyle color="#000000" type="dashed" width="1.0"/>
+                  <y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="22.37646484375" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="254.84199999999998" x="0.0" y="0.0">messagehandler.py</y:NodeLabel>
+                  <y:Shape type="roundrectangle"/>
+                  <y:State closed="false" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
+                  <y:Insets bottom="15" bottomF="15.0" left="15" leftF="15.0" right="15" rightF="15.0" top="15" topF="15.0"/>
+                  <y:BorderInsets bottom="0" bottomF="0.0" left="0" leftF="0.0" right="0" rightF="0.0" top="0" topF="0.0"/>
+                </y:GroupNode>
+                <y:GroupNode>
+                  <y:Geometry height="50.0" width="50.0" x="0.0" y="60.0"/>
+                  <y:Fill color="#F5F5F5" transparent="false"/>
+                  <y:BorderStyle color="#000000" type="dashed" width="1.0"/>
+                  <y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="22.37646484375" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="59.02685546875" x="-4.513427734375" y="0.0">Folder 2</y:NodeLabel>
+                  <y:Shape type="roundrectangle"/>
+                  <y:State closed="true" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
+                  <y:Insets bottom="5" bottomF="5.0" left="5" leftF="5.0" right="5" rightF="5.0" top="5" topF="5.0"/>
+                  <y:BorderInsets bottom="0" bottomF="0.0" left="0" leftF="0.0" right="0" rightF="0.0" top="0" topF="0.0"/>
+                </y:GroupNode>
+              </y:Realizers>
+            </y:ProxyAutoBoundsNode>
+          </data>
+          <graph edgedefault="directed" id="n1::n1:">
+            <node id="n1::n1::n0">
+              <data key="d5"><![CDATA[Owned by Endroid]]></data>
+              <data key="d6">
+                <y:ShapeNode>
+                  <y:Geometry height="59.0" width="123.0" x="780.2941732772433" y="335.352"/>
+                  <y:Fill color="#3366FF" transparent="false"/>
+                  <y:BorderStyle color="#000000" type="line" width="1.0"/>
+                  <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="94.71484375" x="14.142578125" y="20.1494140625">MessageHandler<y:LabelModel>
+                      <y:SmartNodeLabelModel distance="4.0"/>
+                    </y:LabelModel>
+                    <y:ModelParameter>
+                      <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                    </y:ModelParameter>
+                  </y:NodeLabel>
+                  <y:Shape type="rectangle"/>
+                </y:ShapeNode>
+              </data>
+            </node>
+            <node id="n1::n1::n1">
+              <data key="d6">
+                <y:ShapeNode>
+                  <y:Geometry height="40.0" width="58.0" x="947.1361732772433" y="344.852"/>
+                  <y:Fill color="#FFCC00" transparent="false"/>
+                  <y:BorderStyle color="#000000" type="line" width="1.0"/>
+                  <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="52.69140625" x="2.654296875" y="10.6494140625">Message<y:LabelModel>
+                      <y:SmartNodeLabelModel distance="4.0"/>
+                    </y:LabelModel>
+                    <y:ModelParameter>
+                      <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                    </y:ModelParameter>
+                  </y:NodeLabel>
+                  <y:Shape type="rectangle"/>
+                </y:ShapeNode>
+              </data>
+            </node>
+          </graph>
+        </node>
+        <node id="n1::n2" yfiles.foldertype="group">
+          <data key="d4"/>
+          <data key="d6">
+            <y:ProxyAutoBoundsNode>
+              <y:Realizers active="0">
+                <y:GroupNode>
+                  <y:Geometry height="190.87646484375" width="276.00000000000045" x="579.2261732772433" y="47.489637890625175"/>
+                  <y:Fill color="#F5F5F5" transparent="false"/>
+                  <y:BorderStyle color="#000000" type="dashed" width="1.0"/>
+                  <y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="22.37646484375" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="276.00000000000045" x="0.0" y="0.0">pluginmanager.py</y:NodeLabel>
+                  <y:Shape type="roundrectangle"/>
+                  <y:State closed="false" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
+                  <y:Insets bottom="15" bottomF="15.0" left="15" leftF="15.0" right="15" rightF="15.0" top="15" topF="15.0"/>
+                  <y:BorderInsets bottom="0" bottomF="0.0" left="0" leftF="0.0" right="0" rightF="0.0" top="0" topF="0.0"/>
+                </y:GroupNode>
+                <y:GroupNode>
+                  <y:Geometry height="50.0" width="50.0" x="0.0" y="60.0"/>
+                  <y:Fill color="#F5F5F5" transparent="false"/>
+                  <y:BorderStyle color="#000000" type="dashed" width="1.0"/>
+                  <y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="22.37646484375" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="59.02685546875" x="-4.513427734375" y="0.0">Folder 3</y:NodeLabel>
+                  <y:Shape type="roundrectangle"/>
+                  <y:State closed="true" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
+                  <y:Insets bottom="5" bottomF="5.0" left="5" leftF="5.0" right="5" rightF="5.0" top="5" topF="5.0"/>
+                  <y:BorderInsets bottom="0" bottomF="0.0" left="0" leftF="0.0" right="0" rightF="0.0" top="0" topF="0.0"/>
+                </y:GroupNode>
+              </y:Realizers>
+            </y:ProxyAutoBoundsNode>
+          </data>
+          <graph edgedefault="directed" id="n1::n2:">
+            <node id="n1::n2::n0">
+              <data key="d6">
+                <y:ShapeNode>
+                  <y:Geometry height="59.0" width="123.00000000000011" x="717.2261732772437" y="164.36610273437518"/>
+                  <y:Fill color="#FFCC00" transparent="false"/>
+                  <y:BorderStyle color="#000000" type="line" width="1.0"/>
+                  <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="84.71875" x="19.140625000000114" y="20.1494140625">PluginManager<y:LabelModel>
+                      <y:SmartNodeLabelModel distance="4.0"/>
+                    </y:LabelModel>
+                    <y:ModelParameter>
+                      <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                    </y:ModelParameter>
+                  </y:NodeLabel>
+                  <y:Shape type="rectangle"/>
+                </y:ShapeNode>
+              </data>
+            </node>
+            <node id="n1::n2::n1">
+              <data key="d6">
+                <y:ShapeNode>
+                  <y:Geometry height="40.0" width="87.00000000000023" x="594.2261732772433" y="84.86610273437518"/>
+                  <y:Fill color="#FFCC00" transparent="false"/>
+                  <y:BorderStyle color="#000000" type="line" width="1.0"/>
+                  <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="37.357421875" x="24.821289062500114" y="10.6494140625">Plugin<y:LabelModel>
+                      <y:SmartNodeLabelModel distance="4.0"/>
+                    </y:LabelModel>
+                    <y:ModelParameter>
+                      <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                    </y:ModelParameter>
+                  </y:NodeLabel>
+                  <y:Shape type="rectangle"/>
+                </y:ShapeNode>
+              </data>
+            </node>
+            <node id="n1::n2::n2">
+              <data key="d6">
+                <y:ShapeNode>
+                  <y:Geometry height="40.0" width="87.00000000000023" x="594.2261732772433" y="173.86610273437518"/>
+                  <y:Fill color="#FFCC00" transparent="false"/>
+                  <y:BorderStyle color="#000000" type="line" width="1.0"/>
+                  <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="64.03515625" x="11.482421875000114" y="10.6494140625">PluginMeta<y:LabelModel>
+                      <y:SmartNodeLabelModel distance="4.0"/>
+                    </y:LabelModel>
+                    <y:ModelParameter>
+                      <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                    </y:ModelParameter>
+                  </y:NodeLabel>
+                  <y:Shape type="rectangle"/>
+                </y:ShapeNode>
+              </data>
+            </node>
+            <node id="n1::n2::n3">
+              <data key="d6">
+                <y:ShapeNode>
+                  <y:Geometry height="40.0" width="87.00000000000023" x="735.2261732772436" y="87.17787031250018"/>
+                  <y:Fill color="#FFCC00" transparent="false"/>
+                  <y:BorderStyle color="#000000" type="line" width="1.0"/>
+                  <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="68.03125" x="9.484375000000114" y="10.6494140625">PluginProxy<y:LabelModel>
+                      <y:SmartNodeLabelModel distance="4.0"/>
+                    </y:LabelModel>
+                    <y:ModelParameter>
+                      <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                    </y:ModelParameter>
+                  </y:NodeLabel>
+                  <y:Shape type="rectangle"/>
+                </y:ShapeNode>
+              </data>
+            </node>
+          </graph>
+        </node>
+        <node id="n1::n3">
+          <data key="d5"><![CDATA[Owned by Endroid]]></data>
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="59.0" width="123.0" x="566.7058267227567" y="522.3751624499198"/>
+              <y:Fill color="#3366FF" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="79.375" x="21.8125" y="20.1494140625">Rosterhandler<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="rectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+        <node id="n1::n4">
+          <data key="d5"><![CDATA[Owned by Endroid]]></data>
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="59.0" width="123.0" x="775.7058267227567" y="522.3751624499198"/>
+              <y:Fill color="#3366FF" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="85.36328125" x="18.818359375" y="20.1494140625">WokkelHandler<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="rectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+      </graph>
+    </node>
+    <node id="n2" yfiles.foldertype="group">
+      <data key="d4"/>
+      <data key="d6">
+        <y:ProxyAutoBoundsNode>
+          <y:Realizers active="0">
+            <y:GroupNode>
+              <y:Geometry height="111.37646484375" width="681.9340000000002" x="397.3638267227565" y="628.3983248998397"/>
+              <y:Fill color="#F5F5F5" transparent="false"/>
+              <y:BorderStyle color="#000000" type="dashed" width="1.0"/>
+              <y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="22.37646484375" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="681.9340000000002" x="0.0" y="0.0">Wokkel/Twisted</y:NodeLabel>
+              <y:Shape type="roundrectangle"/>
+              <y:State closed="false" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
+              <y:Insets bottom="15" bottomF="15.0" left="15" leftF="15.0" right="15" rightF="15.0" top="15" topF="15.0"/>
+              <y:BorderInsets bottom="0" bottomF="0.0" left="0" leftF="0.0" right="0" rightF="0.0" top="0" topF="0.0"/>
+            </y:GroupNode>
+            <y:GroupNode>
+              <y:Geometry height="50.0" width="50.0" x="0.0" y="60.0"/>
+              <y:Fill color="#F5F5F5" transparent="false"/>
+              <y:BorderStyle color="#000000" type="dashed" width="1.0"/>
+              <y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="22.37646484375" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="67.369140625" x="-8.6845703125" y="0.0">Folder 10</y:NodeLabel>
+              <y:Shape type="roundrectangle"/>
+              <y:State closed="true" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
+              <y:Insets bottom="5" bottomF="5.0" left="5" leftF="5.0" right="5" rightF="5.0" top="5" topF="5.0"/>
+              <y:BorderInsets bottom="0" bottomF="0.0" left="0" leftF="0.0" right="0" rightF="0.0" top="0" topF="0.0"/>
+            </y:GroupNode>
+          </y:Realizers>
+        </y:ProxyAutoBoundsNode>
+      </data>
+      <graph edgedefault="directed" id="n2:">
+        <node id="n2::n0">
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="59.0" width="117.50000000000011" x="785.4558267227567" y="665.7747897435897"/>
+              <y:Fill color="#C0C0C0" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="106.029296875" x="5.7353515625" y="20.1494140625">MUCClientProtocol<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="rectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+        <node id="n2::n1">
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="59.0" width="117.50000000000011" x="946.7978267227568" y="665.7747897435897"/>
+              <y:Fill color="#C0C0C0" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="96.712890625" x="10.3935546875" y="20.1494140625">MessageProtocol<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="rectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+        <node id="n2::n2">
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="59.0" width="117.50000000000011" x="412.3638267227565" y="665.7747897435897"/>
+              <y:Fill color="#C0C0C0" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="114.044921875" x="1.7275390625000568" y="20.1494140625">RosterClientProtocol<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="rectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+        <node id="n2::n3">
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="59.0" width="117.50000000000011" x="573.7058267227567" y="665.7747897435897"/>
+              <y:Fill color="#C0C0C0" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="129.396484375" x="-5.9482421875" y="20.1494140625">PresenceClientProtocol<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="rectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+      </graph>
+    </node>
+    <node id="n3" yfiles.foldertype="group">
+      <data key="d4"/>
+      <data key="d6">
+        <y:ProxyAutoBoundsNode>
+          <y:Realizers active="0">
+            <y:GroupNode>
+              <y:Geometry height="92.37646484375" width="256.79252774439044" x="320.4179705528843" y="-649.0851333007811"/>
+              <y:Fill color="#F5F5F5" transparent="false"/>
+              <y:BorderStyle color="#000000" type="dashed" width="1.0"/>
+              <y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="22.37646484375" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="256.79252774439044" x="0.0" y="0.0">utilities</y:NodeLabel>
+              <y:Shape type="roundrectangle"/>
+              <y:State closed="false" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
+              <y:Insets bottom="15" bottomF="15.0" left="15" leftF="15.0" right="15" rightF="15.0" top="15" topF="15.0"/>
+              <y:BorderInsets bottom="0" bottomF="0.0" left="0" leftF="0.0" right="0" rightF="0.0" top="0" topF="0.0"/>
+            </y:GroupNode>
+            <y:GroupNode>
+              <y:Geometry height="50.0" width="50.0" x="299.55590940504777" y="-662.4584666341144"/>
+              <y:Fill color="#F5F5F5" transparent="false"/>
+              <y:BorderStyle color="#000000" type="dashed" width="1.0"/>
+              <y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="22.37646484375" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="59.02685546875" x="-4.513427734375" y="0.0">Folder 8</y:NodeLabel>
+              <y:Shape type="roundrectangle"/>
+              <y:State closed="true" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
+              <y:Insets bottom="5" bottomF="5.0" left="5" leftF="5.0" right="5" rightF="5.0" top="5" topF="5.0"/>
+              <y:BorderInsets bottom="0" bottomF="0.0" left="0" leftF="0.0" right="0" rightF="0.0" top="0" topF="0.0"/>
+            </y:GroupNode>
+          </y:Realizers>
+        </y:ProxyAutoBoundsNode>
+      </data>
+      <graph edgedefault="directed" id="n3:">
+        <node id="n3::n0">
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="40.0" width="75.0" x="335.4179705528843" y="-611.7086684570311"/>
+              <y:Fill color="#FFCC00" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="30.009765625" x="22.4951171875" y="10.6494140625">Cron<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="rectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+        <node id="n3::n1">
+          <data key="d4"/>
+          <data key="d5"><![CDATA[Owned by endroid]]></data>
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="40.0" width="75.0" x="487.21049829727474" y="-611.7086684570311"/>
+              <y:Fill color="#3366FF" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="55.369140625" x="9.8154296875" y="10.6494140625">Database<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="rectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+      </graph>
+    </node>
+    <node id="n4" yfiles.foldertype="group">
+      <data key="d4"/>
+      <data key="d6">
+        <y:ProxyAutoBoundsNode>
+          <y:Realizers active="0">
+            <y:GroupNode>
+              <y:Geometry height="478.4713465482276" width="745.7458610777235" x="268.3931927083324" y="-498.3581735013523"/>
+              <y:Fill color="#F5F5F5" transparent="false"/>
+              <y:BorderStyle color="#000000" type="dashed" width="1.0"/>
+              <y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="22.37646484375" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="745.7458610777235" x="0.0" y="0.0">plugins</y:NodeLabel>
+              <y:Shape type="roundrectangle"/>
+              <y:State closed="false" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
+              <y:Insets bottom="15" bottomF="15.0" left="15" leftF="15.0" right="15" rightF="15.0" top="15" topF="15.0"/>
+              <y:BorderInsets bottom="0" bottomF="0.0" left="0" leftF="0.0" right="0" rightF="0.0" top="0" topF="0.0"/>
+            </y:GroupNode>
+            <y:GroupNode>
+              <y:Geometry height="50.0" width="50.0" x="249.70111127804404" y="-526.7086684570311"/>
+              <y:Fill color="#F5F5F5" transparent="false"/>
+              <y:BorderStyle color="#000000" type="dashed" width="1.0"/>
+              <y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="22.37646484375" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="59.02685546875" x="-4.513427734375" y="0.0">Folder 9</y:NodeLabel>
+              <y:Shape type="roundrectangle"/>
+              <y:State closed="true" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
+              <y:Insets bottom="5" bottomF="5.0" left="5" leftF="5.0" right="5" rightF="5.0" top="5" topF="5.0"/>
+              <y:BorderInsets bottom="0" bottomF="0.0" left="0" leftF="0.0" right="0" rightF="0.0" top="0" topF="0.0"/>
+            </y:GroupNode>
+          </y:Realizers>
+        </y:ProxyAutoBoundsNode>
+      </data>
+      <graph edgedefault="directed" id="n4:">
+        <node id="n4::n0" yfiles.foldertype="group">
+          <data key="d4"/>
+          <data key="d6">
+            <y:ProxyAutoBoundsNode>
+              <y:Realizers active="0">
+                <y:GroupNode>
+                  <y:Geometry height="185.37646484375" width="602.8558267227575" x="388.3593465544859" y="-220.26329179687474"/>
+                  <y:Fill color="#F5F5F5" transparent="false"/>
+                  <y:BorderStyle color="#000000" type="dashed" width="1.0"/>
+                  <y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="22.37646484375" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="602.8558267227575" x="0.0" y="0.0">Helper Plugins</y:NodeLabel>
+                  <y:Shape type="roundrectangle"/>
+                  <y:State closed="false" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
+                  <y:Insets bottom="15" bottomF="15.0" left="15" leftF="15.0" right="15" rightF="15.0" top="15" topF="15.0"/>
+                  <y:BorderInsets bottom="0" bottomF="0.0" left="0" leftF="0.0" right="0" rightF="0.0" top="0" topF="0.0"/>
+                </y:GroupNode>
+                <y:GroupNode>
+                  <y:Geometry height="50.0" width="50.0" x="0.0" y="60.0"/>
+                  <y:Fill color="#F5F5F5" transparent="false"/>
+                  <y:BorderStyle color="#000000" type="dashed" width="1.0"/>
+                  <y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="22.37646484375" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="67.369140625" x="-8.6845703125" y="0.0">Folder 11</y:NodeLabel>
+                  <y:Shape type="roundrectangle"/>
+                  <y:State closed="true" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
+                  <y:Insets bottom="5" bottomF="5.0" left="5" leftF="5.0" right="5" rightF="5.0" top="5" topF="5.0"/>
+                  <y:BorderInsets bottom="0" bottomF="0.0" left="0" leftF="0.0" right="0" rightF="0.0" top="0" topF="0.0"/>
+                </y:GroupNode>
+              </y:Realizers>
+            </y:ProxyAutoBoundsNode>
+          </data>
+          <graph edgedefault="directed" id="n4::n0:">
+            <node id="n4::n0::n0" yfiles.foldertype="group">
+              <data key="d4"/>
+              <data key="d6">
+                <y:ProxyAutoBoundsNode>
+                  <y:Realizers active="0">
+                    <y:GroupNode>
+                      <y:Geometry height="111.37646484375" width="434.85582672275723" x="541.3593465544861" y="-161.26329179687474"/>
+                      <y:Fill color="#F5F5F5" transparent="false"/>
+                      <y:BorderStyle color="#000000" type="dashed" width="1.0"/>
+                      <y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="22.37646484375" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="434.85582672275723" x="0.0" y="0.0">command.py</y:NodeLabel>
+                      <y:Shape type="roundrectangle"/>
+                      <y:State closed="false" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
+                      <y:Insets bottom="15" bottomF="15.0" left="15" leftF="15.0" right="15" rightF="15.0" top="15" topF="15.0"/>
+                      <y:BorderInsets bottom="0" bottomF="0.0" left="0" leftF="0.0" right="0" rightF="0.0" top="0" topF="0.0"/>
+                    </y:GroupNode>
+                    <y:GroupNode>
+                      <y:Geometry height="50.0" width="50.0" x="0.0" y="60.0"/>
+                      <y:Fill color="#F5F5F5" transparent="false"/>
+                      <y:BorderStyle color="#000000" type="dashed" width="1.0"/>
+                      <y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="22.37646484375" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="59.02685546875" x="-4.513427734375" y="0.0">Folder 4</y:NodeLabel>
+                      <y:Shape type="roundrectangle"/>
+                      <y:State closed="true" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
+                      <y:Insets bottom="5" bottomF="5.0" left="5" leftF="5.0" right="5" rightF="5.0" top="5" topF="5.0"/>
+                      <y:BorderInsets bottom="0" bottomF="0.0" left="0" leftF="0.0" right="0" rightF="0.0" top="0" topF="0.0"/>
+                    </y:GroupNode>
+                  </y:Realizers>
+                </y:ProxyAutoBoundsNode>
+              </data>
+              <graph edgedefault="directed" id="n4::n0::n0:">
+                <node id="n4::n0::n0::n0">
+                  <data key="d6">
+                    <y:ShapeNode>
+                      <y:Geometry height="59.0" width="123.00000000000011" x="671.2151732772433" y="-123.88682695312474"/>
+                      <y:Fill color="#FFCC00" transparent="false"/>
+                      <y:BorderStyle color="#000000" type="line" width="1.0"/>
+                      <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="92.7109375" x="15.144531250000114" y="20.1494140625">CommandPlugin<y:LabelModel>
+                          <y:SmartNodeLabelModel distance="4.0"/>
+                        </y:LabelModel>
+                        <y:ModelParameter>
+                          <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                        </y:ModelParameter>
+                      </y:NodeLabel>
+                      <y:Shape type="rectangle"/>
+                    </y:ShapeNode>
+                  </data>
+                </node>
+                <node id="n4::n0::n0::n1">
+                  <data key="d6">
+                    <y:ShapeNode>
+                      <y:Geometry height="40.0" width="137.0" x="824.2151732772434" y="-114.38682695312474"/>
+                      <y:Fill color="#FFCC00" transparent="false"/>
+                      <y:BorderStyle color="#000000" type="line" width="1.0"/>
+                      <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="119.388671875" x="8.8056640625" y="10.6494140625">CommandPluginMeta<y:LabelModel>
+                          <y:SmartNodeLabelModel distance="4.0"/>
+                        </y:LabelModel>
+                        <y:ModelParameter>
+                          <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                        </y:ModelParameter>
+                      </y:NodeLabel>
+                      <y:Shape type="rectangle"/>
+                    </y:ShapeNode>
+                  </data>
+                </node>
+                <node id="n4::n0::n0::n2">
+                  <data key="d6">
+                    <y:ShapeNode>
+                      <y:Geometry height="59.0" width="84.85582672275712" x="556.3593465544861" y="-123.88682695312474"/>
+                      <y:Fill color="#FFCC00" transparent="false"/>
+                      <y:BorderStyle color="#000000" type="line" width="1.0"/>
+                      <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="59.353515625" x="12.751155548878614" y="20.1494140625">Command<y:LabelModel>
+                          <y:SmartNodeLabelModel distance="4.0"/>
+                        </y:LabelModel>
+                        <y:ModelParameter>
+                          <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                        </y:ModelParameter>
+                      </y:NodeLabel>
+                      <y:Shape type="rectangle"/>
+                    </y:ShapeNode>
+                  </data>
+                </node>
+              </graph>
+            </node>
+            <node id="n4::n0::n1">
+              <data key="d6">
+                <y:ShapeNode>
+                  <y:Geometry height="59.0" width="123.00000000000023" x="403.3593465544859" y="-108.88682695312474"/>
+                  <y:Fill color="#FFCC00" transparent="false"/>
+                  <y:BorderStyle color="#000000" type="line" width="1.0"/>
+                  <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="86.037109375" x="18.481445312500114" y="20.1494140625">PatternMatcher<y:LabelModel>
+                      <y:SmartNodeLabelModel distance="4.0"/>
+                    </y:LabelModel>
+                    <y:ModelParameter>
+                      <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                    </y:ModelParameter>
+                  </y:NodeLabel>
+                  <y:Shape type="rectangle"/>
+                </y:ShapeNode>
+              </data>
+            </node>
+            <node id="n4::n0::n2">
+              <data key="d6">
+                <y:ShapeNode>
+                  <y:Geometry height="59.0" width="123.00000000000023" x="403.3593465544859" y="-182.88682695312474"/>
+                  <y:Fill color="#FFCC00" transparent="false"/>
+                  <y:BorderStyle color="#000000" type="line" width="1.0"/>
+                  <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="70.708984375" x="26.145507812500114" y="20.1494140625">httpInterface<y:LabelModel>
+                      <y:SmartNodeLabelModel distance="4.0"/>
+                    </y:LabelModel>
+                    <y:ModelParameter>
+                      <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                    </y:ModelParameter>
+                  </y:NodeLabel>
+                  <y:Shape type="rectangle"/>
+                </y:ShapeNode>
+              </data>
+            </node>
+          </graph>
+        </node>
+        <node id="n4::n1" yfiles.foldertype="group">
+          <data key="d4"/>
+          <data key="d6">
+            <y:ProxyAutoBoundsNode>
+              <y:Realizers active="0">
+                <y:GroupNode>
+                  <y:Geometry height="143.57623027343732" width="289.5156773838148" x="709.6233764022411" y="-381.95573876953114"/>
+                  <y:Fill color="#F5F5F5" transparent="false"/>
+                  <y:BorderStyle color="#000000" type="dashed" width="1.0"/>
+                  <y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="22.37646484375" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="289.5156773838148" x="0.0" y="0.0">command plugins</y:NodeLabel>
+                  <y:Shape type="roundrectangle"/>
+                  <y:State closed="false" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
+                  <y:Insets bottom="15" bottomF="15.0" left="15" leftF="15.0" right="15" rightF="15.0" top="15" topF="15.0"/>
+                  <y:BorderInsets bottom="0" bottomF="0.0" left="0" leftF="0.0" right="0" rightF="0.0" top="0" topF="0.0"/>
+                </y:GroupNode>
+                <y:GroupNode>
+                  <y:Geometry height="50.0" width="50.0" x="0.0" y="60.0"/>
+                  <y:Fill color="#F5F5F5" transparent="false"/>
+                  <y:BorderStyle color="#000000" type="dashed" width="1.0"/>
+                  <y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="22.37646484375" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="59.02685546875" x="-4.513427734375" y="0.0">Folder 6</y:NodeLabel>
+                  <y:Shape type="roundrectangle"/>
+                  <y:State closed="true" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
+                  <y:Insets bottom="5" bottomF="5.0" left="5" leftF="5.0" right="5" rightF="5.0" top="5" topF="5.0"/>
+                  <y:BorderInsets bottom="0" bottomF="0.0" left="0" leftF="0.0" right="0" rightF="0.0" top="0" topF="0.0"/>
+                </y:GroupNode>
+              </y:Realizers>
+            </y:ProxyAutoBoundsNode>
+          </data>
+          <graph edgedefault="directed" id="n4::n1:">
+            <node id="n4::n1::n0">
+              <data key="d6">
+                <y:ShapeNode>
+                  <y:Geometry height="37.96508164062459" width="75.0" x="724.6233764022411" y="-291.3445901367184"/>
+                  <y:Fill color="#FFCC00" transparent="false"/>
+                  <y:BorderStyle color="#000000" type="line" width="1.0"/>
+                  <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="38.013671875" x="18.4931640625" y="9.631954882812295">Chuck<y:LabelModel>
+                      <y:SmartNodeLabelModel distance="4.0"/>
+                    </y:LabelModel>
+                    <y:ModelParameter>
+                      <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                    </y:ModelParameter>
+                  </y:NodeLabel>
+                  <y:Shape type="rectangle"/>
+                </y:ShapeNode>
+              </data>
+            </node>
+            <node id="n4::n1::n1">
+              <data key="d6">
+                <y:ShapeNode>
+                  <y:Geometry height="35.0" width="71.0" x="813.9964232772422" y="-289.8620493164061"/>
+                  <y:Fill color="#FFCC00" transparent="false"/>
+                  <y:BorderStyle color="#000000" type="line" width="1.0"/>
+                  <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="34.6796875" x="18.16015625" y="8.1494140625">Coolit<y:LabelModel>
+                      <y:SmartNodeLabelModel distance="4.0"/>
+                    </y:LabelModel>
+                    <y:ModelParameter>
+                      <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                    </y:ModelParameter>
+                  </y:NodeLabel>
+                  <y:Shape type="rectangle"/>
+                </y:ShapeNode>
+              </data>
+            </node>
+            <node id="n4::n1::n2">
+              <data key="d6">
+                <y:ShapeNode>
+                  <y:Geometry height="35.0" width="71.0" x="813.9964232772422" y="-344.57927392578114"/>
+                  <y:Fill color="#FFCC00" transparent="false"/>
+                  <y:BorderStyle color="#000000" type="line" width="1.0"/>
+                  <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="28.6796875" x="21.16015625" y="8.1494140625">Help<y:LabelModel>
+                      <y:SmartNodeLabelModel distance="4.0"/>
+                    </y:LabelModel>
+                    <y:ModelParameter>
+                      <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                    </y:ModelParameter>
+                  </y:NodeLabel>
+                  <y:Shape type="rectangle"/>
+                </y:ShapeNode>
+              </data>
+            </node>
+            <node id="n4::n1::n3">
+              <data key="d6">
+                <y:ShapeNode>
+                  <y:Geometry height="35.3441162109375" width="75.0" x="724.6233764022411" y="-344.57927392578114"/>
+                  <y:Fill color="#FFCC00" transparent="false"/>
+                  <y:BorderStyle color="#000000" type="line" width="1.0"/>
+                  <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="32.681640625" x="21.1591796875" y="8.32147216796875">Invite<y:LabelModel>
+                      <y:SmartNodeLabelModel distance="4.0"/>
+                    </y:LabelModel>
+                    <y:ModelParameter>
+                      <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                    </y:ModelParameter>
+                  </y:NodeLabel>
+                  <y:Shape type="rectangle"/>
+                </y:ShapeNode>
+              </data>
+            </node>
+            <node id="n4::n1::n4">
+              <data key="d6">
+                <y:ShapeNode>
+                  <y:Geometry height="35.0" width="84.76958363381254" x="899.3694701522434" y="-289.8620493164061"/>
+                  <y:Fill color="#FFCC00" transparent="false"/>
+                  <y:BorderStyle color="#000000" type="line" width="1.0"/>
+                  <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="82.69140625" x="1.0390886919062723" y="8.1494140625">Theyfightcrime<y:LabelModel>
+                      <y:SmartNodeLabelModel distance="4.0"/>
+                    </y:LabelModel>
+                    <y:ModelParameter>
+                      <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                    </y:ModelParameter>
+                  </y:NodeLabel>
+                  <y:Shape type="rectangle"/>
+                </y:ShapeNode>
+              </data>
+            </node>
+          </graph>
+        </node>
+        <node id="n4::n2">
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="40.0" width="73.0" x="405.3593465544859" y="-406.8579577574118"/>
+              <y:Fill color="#FFCC00" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="48.009765625" x="12.4951171875" y="10.6494140625">Blacklist<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="rectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+        <node id="n4::n3">
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="40.0" width="75.0" x="283.3931927083324" y="-157.02827614433076"/>
+              <y:Fill color="#FFCC00" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="43.33984375" x="15.830078125" y="10.6494140625">Correct<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="rectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+        <node id="n4::n4">
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="40.0" width="75.0" x="712.1187072315686" y="-451.95573876953114"/>
+              <y:Fill color="#FFCC00" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="48.033203125" x="13.4833984375" y="10.6494140625">Echobot<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="rectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+        <node id="n4::n5">
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="40.0" width="75.0" x="405.3593465544859" y="-294.8723923552683"/>
+              <y:Fill color="#FFCC00" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="57.361328125" x="8.8193359375" y="10.6494140625">Pubpicker<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="rectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+        <node id="n4::n6">
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="40.0" width="75.0" x="403.3593465544859" y="-460.9817086576023"/>
+              <y:Fill color="#FFCC00" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="50.67578125" x="12.162109375" y="10.6494140625">Ratelimit<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="rectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+        <node id="n4::n7">
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="42.041631250000364" width="75.0" x="812.9192748397422" y="-452.9765543945313"/>
+              <y:Fill color="#FFCC00" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="68.693359375" x="3.1533203125" y="11.670229687500182">Roomowner<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="rectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+        <node id="n4::n8">
+          <data key="d5"><![CDATA[Fails to retrieve webpage, no exceptions raised or logged]]></data>
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="40.0" width="75.0" x="283.3931927083324" y="-99.38682695312474"/>
+              <y:Fill color="#FF0000" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="30.68359375" x="22.158203125" y="10.6494140625">Spell<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="rectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+        <node id="n4::n9">
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="40.0" width="75.0" x="909.1390537860559" y="-451.95573876953114"/>
+              <y:Fill color="#FFCC00" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="62.048828125" x="6.4755859375" y="10.6494140625">Unhandled<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="rectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+        <node id="n4::n10">
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="40.418096093750364" width="75.0" x="580.0200943509591" y="-347.11626386718757"/>
+              <y:Fill color="#FFCC00" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="37.33984375" x="18.830078125" y="10.858462109375182">Memo<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="rectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+        <node id="n4::n11">
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="37.96508164062459" width="75.11914062499989" x="579.9009537259592" y="-294.5954482421874"/>
+              <y:Fill color="#FFCC00" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="46.017578125" x="14.55078125" y="9.631954882812295">Remote<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="rectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+        <node id="n4::n12">
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="40.0" width="75.0" x="580.0200943509591" y="-451.95573876953114"/>
+              <y:Fill color="#FFCC00" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="38.025390625" x="18.4873046875" y="10.6494140625">Speak<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="rectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+        <node id="n4::n13">
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="40.0" width="75.0" x="580.0200943509591" y="-399.53600131835935"/>
+              <y:Fill color="#FFCC00" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="66.701171875" x="4.1494140625" y="10.6494140625">Whosonline<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="rectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+      </graph>
+    </node>
+    <node id="n5" yfiles.foldertype="group">
+      <data key="d4"/>
+      <data key="d6">
+        <y:ProxyAutoBoundsNode>
+          <y:Realizers active="0">
+            <y:GroupNode>
+              <y:Geometry height="194.87646484375" width="163.3984375" x="-21.750046674678174" y="297.95868626302183"/>
+              <y:Fill color="#F5F5F5" transparent="false"/>
+              <y:BorderStyle color="#000000" type="dashed" width="1.0"/>
+              <y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="22.37646484375" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="163.3984375" x="0.0" y="0.0">Boxes</y:NodeLabel>
+              <y:Shape type="roundrectangle"/>
+              <y:State closed="false" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
+              <y:Insets bottom="15" bottomF="15.0" left="15" leftF="15.0" right="15" rightF="15.0" top="15" topF="15.0"/>
+              <y:BorderInsets bottom="0" bottomF="0.0" left="0" leftF="0.0" right="0" rightF="0.0" top="0" topF="0.0"/>
+            </y:GroupNode>
+            <y:GroupNode>
+              <y:Geometry height="50.0" width="50.0" x="0.0" y="60.0"/>
+              <y:Fill color="#F5F5F5" transparent="false"/>
+              <y:BorderStyle color="#000000" type="dashed" width="1.0"/>
+              <y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="22.37646484375" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="67.369140625" x="-8.6845703125" y="0.0">Folder 15</y:NodeLabel>
+              <y:Shape type="roundrectangle"/>
+              <y:State closed="true" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
+              <y:Insets bottom="5" bottomF="5.0" left="5" leftF="5.0" right="5" rightF="5.0" top="5" topF="5.0"/>
+              <y:BorderInsets bottom="0" bottomF="0.0" left="0" leftF="0.0" right="0" rightF="0.0" top="0" topF="0.0"/>
+            </y:GroupNode>
+          </y:Realizers>
+        </y:ProxyAutoBoundsNode>
+      </data>
+      <graph edgedefault="directed" id="n5:">
+        <node id="n5::n0">
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="35.0" width="90.68359375" x="14.607375200321826" y="335.33515110677183"/>
+              <y:Fill color="#FFCC00" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="88.052734375" x="1.3154296875" y="8.1494140625">Endroid module<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="rectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+        <node id="n5::n1">
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="30.0" width="90.68359375" x="14.607375200321826" y="389.08515110677183"/>
+              <y:Fill color="#3366FF" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="133.3984375" x="-21.357421875" y="5.6494140625">Owned by Endroid class<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="rectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+        <node id="n5::n2">
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="40.0" width="91.54065915576768" x="13.750309794554141" y="437.83515110677183"/>
+              <y:Fill color="#C0C0C0" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="84.02734375" x="3.7566577028838424" y="10.6494140625">External library<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="rectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+      </graph>
+    </node>
+    <node id="n6" yfiles.foldertype="group">
+      <data key="d4"/>
+      <data key="d6">
+        <y:ProxyAutoBoundsNode>
+          <y:Realizers active="0">
+            <y:GroupNode>
+              <y:Geometry height="239.9237978240185" width="88.0" x="61.77179867788573" y="-460.9817086576023"/>
+              <y:Fill color="#F5F5F5" transparent="false"/>
+              <y:BorderStyle color="#000000" type="dashed" width="1.0"/>
+              <y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="22.37646484375" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="88.0" x="0.0" y="0.0">Working?</y:NodeLabel>
+              <y:Shape type="roundrectangle"/>
+              <y:State closed="false" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
+              <y:Insets bottom="15" bottomF="15.0" left="15" leftF="15.0" right="15" rightF="15.0" top="15" topF="15.0"/>
+              <y:BorderInsets bottom="0" bottomF="0.0" left="0" leftF="0.0" right="0" rightF="0.0" top="0" topF="0.0"/>
+            </y:GroupNode>
+            <y:GroupNode>
+              <y:Geometry height="50.0" width="50.0" x="272.4179705528843" y="-482.2961901792868"/>
+              <y:Fill color="#F5F5F5" transparent="false"/>
+              <y:BorderStyle color="#000000" type="dashed" width="1.0"/>
+              <y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="22.37646484375" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="67.369140625" x="-8.6845703125" y="0.0">Folder 12</y:NodeLabel>
+              <y:Shape type="roundrectangle"/>
+              <y:State closed="true" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
+              <y:Insets bottom="5" bottomF="5.0" left="5" leftF="5.0" right="5" rightF="5.0" top="5" topF="5.0"/>
+              <y:BorderInsets bottom="0" bottomF="0.0" left="0" leftF="0.0" right="0" rightF="0.0" top="0" topF="0.0"/>
+            </y:GroupNode>
+          </y:Realizers>
+        </y:ProxyAutoBoundsNode>
+      </data>
+      <graph edgedefault="directed" id="n6:">
+        <node id="n6::n0">
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="35.3441162109375" width="58.0" x="76.77179867788573" y="-423.6052438138523"/>
+              <y:Fill color="#FFCC00" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="29.3359375" x="14.33203125" y="8.32147216796875">Fully<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="rectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+        <node id="n6::n1">
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="35.3441162109375" width="58.0" x="76.77179867788573" y="-372.3149874035959"/>
+              <y:Fill color="#800000" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="46.6796875" x="5.66015625" y="8.32147216796875">Partially<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="rectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+        <node id="n6::n2">
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="35.0" width="56.908717948717936" x="77.86308072916779" y="-320.18551847831554"/>
+              <y:Fill color="#FF0000" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="22.673828125" x="17.117444911858968" y="8.1494140625">Not<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="rectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+        <node id="n6::n3">
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="35.0" width="56.908717948717936" x="77.86308072916779" y="-271.05791083358383"/>
+              <y:Fill color="#800080" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="52.029296875" x="2.4397105368589678" y="8.1494140625">Untested<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="rectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+      </graph>
+    </node>
+    <node id="n7" yfiles.foldertype="group">
+      <data key="d4"/>
+      <data key="d6">
+        <y:ProxyAutoBoundsNode>
+          <y:Realizers active="0">
+            <y:GroupNode>
+              <y:Geometry height="285.1195933894167" width="99.361328125" x="-69.7174060496784" y="-459.25237601787234"/>
+              <y:Fill color="#F5F5F5" transparent="false"/>
+              <y:BorderStyle color="#000000" type="dashed" width="1.0"/>
+              <y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="22.37646484375" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="99.361328125" x="0.0" y="0.0">Arrows</y:NodeLabel>
+              <y:Shape type="roundrectangle"/>
+              <y:State closed="false" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
+              <y:Insets bottom="15" bottomF="15.0" left="15" leftF="15.0" right="15" rightF="15.0" top="15" topF="15.0"/>
+              <y:BorderInsets bottom="0" bottomF="0.0" left="0" leftF="0.0" right="0" rightF="0.0" top="0" topF="0.0"/>
+            </y:GroupNode>
+            <y:GroupNode>
+              <y:Geometry height="50.0" width="50.0" x="-69.7174060496784" y="-459.25237601787234"/>
+              <y:Fill color="#F5F5F5" transparent="false"/>
+              <y:BorderStyle color="#000000" type="dashed" width="1.0"/>
+              <y:NodeLabel alignment="right" autoSizePolicy="node_width" backgroundColor="#EBEBEB" borderDistance="0.0" fontFamily="Dialog" fontSize="15" fontStyle="plain" hasLineColor="false" height="22.37646484375" modelName="internal" modelPosition="t" textColor="#000000" visible="true" width="67.369140625" x="-8.6845703125" y="0.0">Folder 13</y:NodeLabel>
+              <y:Shape type="roundrectangle"/>
+              <y:State closed="true" closedHeight="50.0" closedWidth="50.0" innerGraphDisplayEnabled="false"/>
+              <y:Insets bottom="5" bottomF="5.0" left="5" leftF="5.0" right="5" rightF="5.0" top="5" topF="5.0"/>
+              <y:BorderInsets bottom="0" bottomF="0.0" left="0" leftF="0.0" right="0" rightF="0.0" top="0" topF="0.0"/>
+            </y:GroupNode>
+          </y:Realizers>
+        </y:ProxyAutoBoundsNode>
+      </data>
+      <graph edgedefault="directed" id="n7:">
+        <node id="n7::n0">
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="35.0" width="58.0" x="-49.03674198717839" y="-421.87591117412234"/>
+              <y:Fill color="#000000" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#FFFFFF" visible="true" width="35.34765625" x="11.326171875" y="8.1494140625">Has a<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="rectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+        <node id="n7::n1">
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="35.0" width="58.0" x="-49.03674198717839" y="-317.98303903871204"/>
+              <y:Fill color="#FF0000" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="43.3515625" x="7.32421875" y="8.1494140625">Inherits<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="rectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+        <node id="n7::n2">
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="35.0" width="58.0" x="-49.03674198717839" y="-271.05791083358383"/>
+              <y:Fill color="#FF6600" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="60.68359375" x="-1.341796875" y="8.1494140625">MetaClass<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="rectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+        <node id="n7::n3">
+          <data key="d5"><![CDATA[Who gives config to whom]]></data>
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="40.0" width="57.99999999999997" x="-49.03674198717839" y="-372.42947510641716"/>
+              <y:Fill color="#FFFFFF" transparent="false"/>
+              <y:BorderStyle color="#000000" type="dashed" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="38.6875" x="9.656249999999986" y="10.6494140625">Config<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="rectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+        <node id="n7::n4">
+          <data key="d6">
+            <y:ShapeNode>
+              <y:Geometry height="35.0" width="57.99999999999997" x="-49.03674198717839" y="-224.13278262845563"/>
+              <y:Fill color="#C0C0C0" transparent="false"/>
+              <y:BorderStyle color="#000000" type="line" width="1.0"/>
+              <y:NodeLabel alignment="center" autoSizePolicy="content" fontFamily="Dialog" fontSize="12" fontStyle="plain" hasBackgroundColor="false" hasLineColor="false" height="18.701171875" modelName="custom" textColor="#000000" visible="true" width="69.361328125" x="-5.680664062500014" y="8.1494140625">Unimportant<y:LabelModel>
+                  <y:SmartNodeLabelModel distance="4.0"/>
+                </y:LabelModel>
+                <y:ModelParameter>
+                  <y:SmartNodeLabelModelParameter labelRatioX="0.0" labelRatioY="0.0" nodeRatioX="0.0" nodeRatioY="0.0" offsetX="0.0" offsetY="0.0" upX="0.0" upY="-1.0"/>
+                </y:ModelParameter>
+              </y:NodeLabel>
+              <y:Shape type="rectangle"/>
+            </y:ShapeNode>
+          </data>
+        </node>
+      </graph>
+    </node>
+    <edge id="n1::e0" source="n1::n3" target="n1::n0::n0">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="-0.0" sy="0.0" tx="-0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="n1::n0::e0" source="n1::n0::n1" target="n1::n0::n0">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="-0.0" sy="0.0" tx="-0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="n1::n0::e1" source="n1::n0::n2" target="n1::n0::n0">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="-0.0" sy="0.0" tx="-0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="n1::e1" source="n1::n4" target="n1::n1::n0">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="-0.0" sy="0.0" tx="-0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="n1::n1::e0" source="n1::n1::n1" target="n1::n1::n0">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="-0.0" sy="0.0" tx="-0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="n1::n1::e1" source="n1::n1::n0" target="n1::n1::n1">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="-0.0" sy="0.0" tx="-12.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e0" source="n2::n3" target="n1::n3">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="-0.0" sy="0.0" tx="-0.0" ty="0.0"/>
+          <y:LineStyle color="#FF0000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e1" source="n2::n2" target="n1::n3">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="-0.0" sy="0.0" tx="-0.0" ty="0.0"/>
+          <y:LineStyle color="#FF0000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e2" source="n2::n0" target="n1::n4">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="-0.0" sy="0.0" tx="-0.0" ty="0.0"/>
+          <y:LineStyle color="#FF0000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e3" source="n2::n1" target="n1::n4">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="-0.0" sy="0.0" tx="-0.0" ty="0.0"/>
+          <y:LineStyle color="#FF0000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="n1::n0::e2" source="n1::n0::n2" target="n1::n0::n1">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="-0.0" sy="0.0" tx="-0.0" ty="0.0"/>
+          <y:LineStyle color="#FF0000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="n1::e2" source="n1::n1::n0" target="n1::n2::n0">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="n1::e3" source="n1::n0::n0" target="n1::n2::n0">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="n1::n2::e0" source="n1::n2::n2" target="n1::n2::n1">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
+          <y:LineStyle color="#FF6600" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="n1::n2::e1" source="n1::n2::n1" target="n1::n2::n3">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="n1::n2::e2" source="n1::n2::n3" target="n1::n2::n0">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="n1::e4" source="n1::n1::n0" target="n1::n4">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="-0.0" sy="0.0" tx="-0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="n1::e5" source="n1::n0::n0" target="n1::n3">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="-0.0" sy="0.0" tx="-0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="n1::n2::e3" source="n1::n2::n0" target="n1::n2::n3">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="7.866864843749568"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="n1::n2::e4" source="n1::n2::n3" target="n1::n2::n1">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="-35.75000000000023" ty="0.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="n1::e6" source="n1::n0::n0" target="n1::n1::n0">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="-0.0" sy="0.0" tx="-0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="n0::e0" source="n0::n0" target="n0::n1">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="-0.0" sy="0.0" tx="-0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e4" source="n1::n2::n1" target="n4">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
+          <y:LineStyle color="#FF0000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e5" source="n0::n1" target="n1::n4">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0">
+            <y:Point x="645.7396923076924" y="458.9696312500008"/>
+          </y:Path>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e6" source="n3::n1" target="n4::n2">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="-1.1368683772161603E-13" tx="1.1368683772161603E-13" ty="-5.115907697472721E-13"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e7" source="n3::n1" target="n4::n10">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="-1.1368683772161603E-13" tx="-3.410605131648481E-13" ty="1.7053025658242404E-13"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e8" source="n3::n1" target="n4::n5">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="-1.1368683772161603E-13" tx="3.410605131648481E-13" ty="1.1368683772161603E-13"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e9" source="n3::n1" target="n4::n6">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="-1.1368683772161603E-13" tx="-1.1368683772161603E-13" ty="3.410605131648481E-13"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e10" source="n3::n1" target="n4::n11">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="-1.1368683772161603E-13" tx="0.0" ty="-5.6843418860808015E-14"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e11" source="n3::n0" target="n4::n6">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="-1.1368683772161603E-13" sy="-1.1368683772161603E-13" tx="-1.1368683772161603E-13" ty="3.410605131648481E-13"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e12" source="n3::n0" target="n4::n2">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="-1.1368683772161603E-13" sy="-1.1368683772161603E-13" tx="1.1368683772161603E-13" ty="-5.115907697472721E-13"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e13" source="n3" target="n0">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0">
+            <y:Point x="208.9513425641046" y="-602.0835675455728"/>
+            <y:Point x="208.9513425641046" y="369.47461099258913"/>
+          </y:Path>
+          <y:LineStyle color="#000000" type="dashed" width="1.0"/>
+          <y:Arrows source="standard" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="n3::e0" source="n3::n1" target="n3::n0">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="-0.0" sy="0.0" tx="-0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="n4::e0" source="n4::n0::n0::n0" target="n4::n1">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
+          <y:LineStyle color="#FF0000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="n4::n0::n0::e0" source="n4::n0::n0::n1" target="n4::n0::n0::n0">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
+          <y:LineStyle color="#FF6600" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="n4::n0::n0::e1" source="n4::n0::n0::n2" target="n4::n0::n0::n0">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="n4::e1" source="n4::n0::n1" target="n4::n8">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="n4::e2" source="n4::n0::n2" target="n4::n11">
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e14" source="n0::n2" target="n1::n0">
+      <data key="d8"/>
+      <data key="d9"><![CDATA[From Endroid]]></data>
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="dashed" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="n1::e7" source="n1::n0" target="n1::n2">
+      <data key="d9"><![CDATA[From UserManagement]]></data>
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="dashed" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="e15" source="n1" target="n4">
+      <data key="d9"><![CDATA[From PluginManager]]></data>
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="dashed" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="n1::e8" source="n1::n0::n0" target="n1::n4">
+      <data key="d9"/>
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+    <edge id="n1::e9" source="n1::n4" target="n1::n0::n0">
+      <data key="d9"/>
+      <data key="d10">
+        <y:PolyLineEdge>
+          <y:Path sx="0.0" sy="0.0" tx="0.0" ty="0.0"/>
+          <y:LineStyle color="#000000" type="line" width="1.0"/>
+          <y:Arrows source="none" target="standard"/>
+          <y:BendStyle smoothed="false"/>
+        </y:PolyLineEdge>
+      </data>
+    </edge>
+  </graph>
+  <data key="d0">
+    <y:Resources/>
+  </data>
+</graphml>

=== modified file 'src/endroid.sh'
--- src/endroid.sh	2012-08-02 10:49:57 +0000
+++ src/endroid.sh	2013-08-12 17:50:48 +0000
@@ -1,2 +1,2 @@
 #!/bin/sh
-PYTHONPATH="../lib/wokkel-0.7.0-py2.7.egg":"${PYTHONPATH}" python -c "import endroid; endroid.main()" $@
+PYTHONPATH="../lib/wokkel-0.7.1-py2.7.egg":"${PYTHONPATH}" python -m endroid $@

=== modified file 'src/endroid/__init__.py'
--- src/endroid/__init__.py	2012-09-04 15:10:26 +0000
+++ src/endroid/__init__.py	2013-08-12 17:50:48 +0000
@@ -5,7 +5,6 @@
 # -----------------------------------------
 
 import os
-import os.path
 import sys
 from argparse import ArgumentParser
 import logging
@@ -14,58 +13,72 @@
 from twisted.internet import reactor
 from twisted.internet.defer import Deferred, DeferredList, inlineCallbacks
 from twisted.words.protocols.jabber.jid import JID
+from twisted.python import log  # used for xml logging
+
 from wokkel.client import XMPPClient
 
-from endroid.config import EnConfigParser
+# endroid base layer
 from endroid.rosterhandler import RosterHandler
 from endroid.wokkelhandler import WokkelHandler
+# top layer
+from endroid.usermanagement import UserManagement
 from endroid.messagehandler import MessageHandler
-from endroid.usermanagement import UserManagement
+# utilities
+from endroid.confparser import Parser
 from endroid.database import Database
-from endroid.pluginmanager import PluginManager
-
-__version__ = (1, 1)
-
-LOGGING_FORMAT = '%(asctime)-15s %(message)s'
+from endroid.manhole import start_manhole
+
+
+__version__ = (1, 2)
+
+LOGGING_FORMAT = '%(asctime)-8s %(levelname)-8s %(message)s'
+LOGGING_DATE_FORMAT = '%H:%M:%S'
+# LOGGING_FORMAT = '%(levelname)-5s: %(message)s'
+
 
 class Endroid(object):
     def __init__(self, conffile, logtraffic=False):
         self.application = service.Application("EnDroid")
-        
-        self.conf = EnConfigParser(conffile)
-        
-        jid = self.conf['jid']
-        self.jid = jid
+
+        self.conf = Parser(conffile)
+
+        self.jid = self.conf.get("setup", "jid")
         logging.info("Found JID: " + self.jid)
-        
-        self.secret = self.conf['secret']
+
+        self.secret = self.conf.get("setup", "password")
         logging.info("Found Secret: **********")
-        
-        self.nick = self.conf['nick']
-        logging.info("Found Default Nick: " + self.nick)
-        
-        self.rooms = self.conf['rooms']
-        for room in self.rooms:
+
+        rooms = self.conf.get("setup", "rooms", default=[])
+        for room in rooms:
             logging.info("Found Room to Join: " + room)
-        
-        dbfile = self.conf['database']['dbfile']
+
+        groups = self.conf.get("setup", "groups", default=['all'])
+        for group in groups:
+            logging.info("Found Group: " + group)
+
+        dbfile = self.conf.get("database", "dbfile")
         logging.info("Using " + dbfile + " as database file")
         Database.setFile(dbfile)
-        
+
+        logfile = self.conf.get("setup", "logfile")
+        logging.info("Using " + logfile + " as xml log file")
+        log.startLogging(open(os.path.expanduser(logfile), "w+"))
+
         self.client = XMPPClient(JID(self.jid), self.secret)
         logging.info("Setting traffic logging to " + str(logtraffic))
         self.client.logTraffic = logtraffic
+
         self.client.setServiceParent(self.application)
-        
-        self.roster = RosterHandler()
-        self.roster.setHandlerParent(self.client)
-        
-        self.wh = WokkelHandler(JID(self.jid), self.nick, self.rooms)
-        self.wh.setHandlerParent(self.client)
-
-        self.messagehandler = MessageHandler(self.wh)
-        self.usermanagement = UserManagement(self.roster, self.wh)
-        
+
+        self.rosterhandler = RosterHandler()
+        self.rosterhandler.setHandlerParent(self.client)
+
+        self.wokkelhandler = WokkelHandler()
+        self.wokkelhandler.setHandlerParent(self.client)
+
+        self.usermanagement = UserManagement(self.wokkelhandler, self.rosterhandler, self.conf)
+        self.messagehandler = MessageHandler(self.wokkelhandler, self.usermanagement)
+
         # Fire off our startup flow (once the reactor is running)
         reactor.callWhenRunning(self.startup_flow)
 
@@ -74,57 +87,21 @@
         # Start the client!
         self.client.startService()
 
-        # First, we wait for the Roster and connection to Wokkel
-        connd = Deferred()
-        rosterd = Deferred()
-        self.wh.set_connected_handler(connd)
-        self.roster.set_loaded_handler(rosterd)
-        yield DeferredList([connd, rosterd])
-
-        # Ensure that everyone in the config file is in the contacts list.
-        # And remove anyone in the roster who isn't in the contacts list
-        # We only do this after the roster is loaded, so we don't prematurely
-        # try to add peeps
-        self.usermanagement.init_contacts(self.conf['users'])
-        
-        # Now load plugins for all the configured user groups
-        for gname, group  in self.conf['usergroups'].items():
-            logging.info("Initialising User Group: " + gname)
-            pm = PluginManager(self.messagehandler, self.usermanagement,
-                               userlist=group['users'])
-            if group['plugins']:
-                for p in group['plugins']:
-                    pm.load(p, self.conf['plugindata'][p])
-                for p in group['plugins']:
-                    pm.init(p)
-            else:
-                logging.error("No Plugins Loaded For User Group: {0}".format(gname))
-
-        # Then join all the rooms we are configured in (and init their plugins)
-        roomjoinds = []
-        for rjid, rconf in self.conf['rooms'].items():
-            pm = PluginManager(self.messagehandler, self.usermanagement, rjid)
-            if rconf['plugins']:
-                for p in rconf['plugins']:
-                    pm.load(p, rconf['plugindata'][p])
-                for p in rconf['plugins']:
-                    pm.init(p)
-
-            rnick = rconf.get('nick', self.nick)
-
-            logging.info("Joining Room " + rjid + " as \"" + rnick + "\"")
-
-        logging.info("We have normality. I repeat, we have normality. "
-                     "Anything you still can't cope with is therefore your "
-                     "own problem.")
+        # wait for the wokkelhandler and rosterhandler to connect
+        whd = Deferred()
+        rhd = Deferred()
+        self.wokkelhandler.set_connected_handler(whd)
+        self.rosterhandler.set_connected_handler(rhd)
+        yield DeferredList([whd, rhd])
 
     def run(self):
         reactor.run()
 
+
 def main():
     parser = ArgumentParser(prog="endroid",
                             epilog="I'm a robot. I'm not a refrigerator.",
-                            description="EnDroid: extensible XMPP Bot")
+                            description="EnDroid: Extensible XMPP Bot")
     parser.add_argument("conffile", nargs='?', default="",
                         help="Configuration file to use.")
     parser.add_argument("-l", "--level", type=int, default=logging.INFO,
@@ -133,13 +110,15 @@
                         help="File for logging output.")
     parser.add_argument("-t", "--logtraffic", action='store_true',
                         help="Additionally log all traffic.")
+    parser.add_argument("-m", "--manhole", nargs='+', default=None,
+                        help="Login name, password and port for ssh access")
     args = parser.parse_args()
 
     if args.logfile:
         logging.basicConfig(filename=args.logfile, level=args.level,
-                            format=LOGGING_FORMAT)
+                            format=LOGGING_FORMAT, datefmt=LOGGING_DATE_FORMAT)
     else:
-        logging.basicConfig(level=args.level, format=LOGGING_FORMAT)
+        logging.basicConfig(level=args.level, format=LOGGING_FORMAT, datefmt=LOGGING_DATE_FORMAT)
 
     cmd = args.conffile
     env = os.environ.get("ENDROID_CONF", "")
@@ -153,8 +132,14 @@
         sys.exit(1)
 
     logging.info("EnDroid starting up with conffile {0}".format(conffile))
+
     droid = Endroid(conffile, logtraffic=args.logtraffic)
-    droid.run()
+
+    if args.manhole:
+        manhole_dict = dict([('droid', droid)] + globals().items())
+        start_manhole(droid, manhole_dict, args.manhole)
+    else:
+        droid.run()
 
 if __name__ == "__main__":
     main()

=== removed file 'src/endroid/config.py'
--- src/endroid/config.py	2012-08-31 12:10:51 +0000
+++ src/endroid/config.py	1970-01-01 00:00:00 +0000
@@ -1,159 +0,0 @@
-# -----------------------------------------
-# Endroid - XMPP Bot
-# Copyright 2012, Ensoft Ltd.
-# Created by Jonathan Millican
-# -----------------------------------------
-
-from ConfigParser import ConfigParser
-import re
-import os.path
-import logging
-import sys
-
-pluginOptions = {}
-
-class EnConfigParser(ConfigParser, dict):
-    def _sections(self):
-        return ConfigParser._sections(self)
-    
-    def __setitem__(self, key, value):
-        super(EnConfigParser, self).__setitem__(key, value)
-        
-    def __delitem__(self):
-        return super(EnConfigParser,self).__delitem__()
-    
-    def __iter__(self):
-        return super(EnConfigParser,self).__iter__()
-    
-    
-    def __init__(self, filename):
-        super(EnConfigParser, self).__init__()
-        
-        self.optionxform = str
-        with open(filename) as f:
-            self.readfp(f)
-        
-        self['database'] = {'dbfile': self.get('Database', 'dbfile')}
-        self['jid'] = self.get('Setup', 'jid')
-        self['secret'] = self.get('Setup', 'secret')
-        
-        self['plugindata'] = {}
-        
-        self['nick'] = self.get('Setup', 'nick', self['jid'])
-        self['plugins'] = self.getlist('Setup', 'plugins')
-        self.getPluginData(self['plugins'])
-        
-        self['users'] = self.getlist('Setup', 'users')
-
-        # Plugins can be found in various dirs
-        for dir in self.getlist('Setup', 'plugindirs', ['~/.endroid/plugins/']):
-            sys.path.append(os.path.expanduser(dir))
-
-        defRoom = {}
-        defRoom['nick'] = self.get('Room:*', 'nick', self['nick'])
-        defRoom['plugins'] = self.getlist('Room:*', 'plugins', self['plugins'])
-        self.getPluginData(defRoom['plugins'])
-        
-        roomlist = self.getlist('Setup', 'rooms')
-        self['rooms'] = {}
-        self['rooms'] = dict((k, defRoom.copy()) for k in roomlist)
-        
-        defUGroup = {'users': self['users'][:]} # Creates a copy of self['users']
-        defUGroup['plugins'] = self.getlist('UserGroup:*', 'plugins', self['plugins'])
-        self.getPluginData(defUGroup['plugins'])
-            
-        self['usergroups'] = {'*': defUGroup}
-        
-        for item in self.sections():
-            if item[0:10] == 'UserGroup:' and item[10:] != '*':
-                key = item[10:]
-                logging.info("Found User Group: " + key)
-                uGroup = {}
-                uGroup['users'] = self.getlist(item, 'users')
-                for userjid in uGroup['users']:
-                    if userjid in self['usergroups']['*']['users']:
-                        self['usergroups']['*']['users'].remove(userjid)
-                        logging.info("User " + userjid + " added to " + key + ", and removed from default user group.")
-                    else:
-                        uGroup['users'].remove(userjid)
-                        logging.info("User " + userjid + " not permitted in Setup section. Not being added to " + key)
-                        
-                uGroup['plugins'] = self.getlist(item, 'plugins', self['usergroups']['*']['plugins'])
-                self.getPluginData(uGroup['plugins'])
-                                
-                self['usergroups'][key] = uGroup
-                
-            elif item[0:5] == 'Room:' and item[5:] != '*':
-                key = item[5:]
-                if self['rooms'].has_key(key):
-                    self['rooms'][key]['nick'] = self.get(item, 'nick', self['nick'])
-                    self['rooms'][key]['plugins'] = self.getlist(item, 'plugins', defRoom['plugins'])
-                    self.getPluginData(self['rooms'][key]['plugins'])
-        
-        for roomjid in self['rooms']:
-            self['rooms'][roomjid]['plugindata'] = {}
-            for plugin in self['rooms'][roomjid]['plugins']:
-                self['rooms'][roomjid]['plugindata'][plugin] = self.getSpecificPluginData(plugin, "Room:" + roomjid)
-    
-    
-    def getPluginData(self, pList):
-        for plugin in pList:
-            if not self['plugindata'].has_key(plugin):
-                self['plugindata'][plugin] = plugin_config(plugin, self)
-    
-    def getSpecificPluginData(self, pName, section):
-        self.getPluginData([pName])
-        if os.path.exists('config/plugin-' + pName + '.cfg'):
-            pData = self['plugindata'][pName].copy()
-            pConf = ConfigParser()
-            pConf.optionxform = str
-            with open('config/plugin-' + pName + '.cfg') as f:
-                pConf.readfp(f)
-            
-            if not pConf.has_section(section):
-                return pData
-            else:
-                opts = pConf.options(section)
-                for option in opts:
-                    pData[option] = pConf.get(section, option)
-                return pData
-        else:
-            return self['plugindata'][pName]
-    
-    
-    def get(self, section, option, default=None):
-        if default == None:
-            return ConfigParser.get(self, section, option)
-        else:
-            if self.has_option(section, option):
-                return ConfigParser.get(self, section, option)
-            else:
-                return default
-            
-    def getlist(self, section, option, default=None):
-        if self.has_option(section, option) or default == None:
-            return as_list(self.get(section, option, ''))
-        else:
-            return default
-
-SPLITTER = re.compile("[,\n]")
-
-def as_list(value):
-    """
-    Given a string containing potentially multiple lines of comma-separated
-    items, returns a list of those items. Newlines are treated as separators
-    (even without a trailing comma), and all items are stripped of whitespace
-    either side.
-    """
-    return [item.strip() for item in SPLITTER.split(value) if item.strip()]
-
-def plugin_config(plugName, mConf):
-    if pluginOptions.has_key(plugName):
-        return pluginOptions[plugName]
-    confData = {}
-    if mConf.has_section('Plugin:' + plugName):
-        opts = mConf.options('Plugin:' + plugName)
-        for option in opts:
-            confData[option] = mConf.get('Plugin:' + plugName, option)
-    pluginOptions[plugName] = confData
-    return confData

=== added file 'src/endroid/confparser.py'
--- src/endroid/confparser.py	1970-01-01 00:00:00 +0000
+++ src/endroid/confparser.py	2013-08-12 17:50:48 +0000
@@ -0,0 +1,179 @@
+from ConfigParser import ConfigParser
+from ast import literal_eval
+from collections import defaultdict
+import copy
+import re
+
+class Parser(object):
+    """Reads an ini-like configuration file into an internal dictionary.
+    Extra syntax:
+     - nested sections:
+        [root:child:grandchild:...]: stored as nested dictionaries with values
+        accessible via .get("root", "child", "grandchild", ..., "key")
+     - or syntax:
+        [root:child1|child2:...]: .get("root", "child1", ...) and .get("root", "child2"...)
+        will look in this section. Note that the or syntax is usable at any depth
+        and with any number of alternatives (so [root1|root2:child1|child2|child2:...] 
+        is fine)
+     - wildcard syntax:
+        [root:*:grandchild:...]: .get("root", <anything>: "grandchild", ...) will
+        look in this section. Again the wildcard character may be used at any depth
+        (so [*:*:*:...] is doable)
+     - order of search:
+        the .get method will return the most specified result it can find. The order
+        of search is:
+            [foo:bar] - first
+            [foo:bar|baz]
+            [foo|far:bar]
+            [foo|far:bar|baz]
+            [foo:*]
+            [foo|far:*]
+            [*:bar]
+            [*:bar|baz]
+            [*:*] - last
+     - lists:
+        - Parser will try to identify lists by the presence interior commas and
+        newlines. The entry:
+            key = var1, var2, var3
+        will be returned as a list
+        - For a single item list, a comma must be present:
+            key = var1,
+        - Multiline lists do not need commas:
+            key = var1
+                var2
+                var3
+        as internal newlines are present
+    Arguments to .get:
+      - 'default' may be specified in which case KeyErrors will never be raised
+      - 'return_all' will cause get to return all possible results rather than
+      only the most relevant
+    Notes:
+      - All section names will have all whitespace removed and will be converted
+      to lower case ([Foo |  BAR ] -> [foo|bar])
+      - Values in the config file will be parsed with literal_eval so will return
+      from .get as Python objects rather than strings (though if literal_eval fails
+      then a string will be returned)
+    """
+    SPLITTER = re.compile("[,\n]")
+
+    def __init__(self, filename=None):
+        self.filename = filename
+        self.dict = {}
+        self._aliases = defaultdict(list)
+
+        if filename:
+            self.load(filename)
+
+    def load(self, filename=None):
+        filename = filename or self.filename
+        self.read_file(filename)
+        self.build_dict()
+
+    def read_file(self, filename):
+        cp = ConfigParser()
+        cp.optionxform = Parser.sanitise
+
+        with open(filename) as f:
+            cp.readfp(f)
+            self.filename = filename
+
+        # transform Parser section labels into lists of sanitise label parts
+        # eg "foo: bar | Bar2 : BAZ" -> ["foo","bar|bar2","baz"]
+        sections = cp.sections()
+        process_tuple = Parser.process_tuple
+        self._parts = [map(Parser.sanitise, s.split(':')) for s in sections]
+        self._items = [map(process_tuple, ts) for ts in map(cp.items, sections)]
+
+    def build_dict(self):
+        new_dict = {}
+        for part_list, items_list in zip(self._parts, self._items):
+            d = new_dict
+            for part in part_list:
+                d = d.setdefault(part, {})
+            # set the value when we get to the last part
+            d.update(dict(items_list))
+
+        self.dict = new_dict
+
+        # register aliases (for the or syntax)
+        for part in [p for parts in self._parts for p in parts if '|' in p]:
+            for sub_p in part.split('|'):
+                # register the full arg against its parts if we haven't
+                # already so for the arg "name1|name2":
+                #   self._aliases[name1] = ["name1|name2"]
+                #   self._aliases[name2] = ["name1|name2"]
+                if not part in self._aliases[sub_p]:
+                    self._aliases[sub_p].append(part)
+
+    def get(self, *args, **kwargs):
+        # note that this is quite a slow lookup function to support the wildcard
+        # '*' and or '|' syntax without complicating self.dict - shouldn't matter
+        # as it shouldn't be called too often
+        if not self.filename:
+            msg = "[{0}] lookup but no file loaded"
+            raise ValueError(msg.format(':'.join(args)))
+
+        dicts = [self.dict]
+        for arg in [a.lower() for a in args]:
+            # currently looking in [dict1, dict2...] - now move our focus to
+            # [dict1[a], dict2[a]... dict1[a|o], dict2[a|o]... dict1[*], dict2[*]...]
+            # in order: [arg, aliases (eg arg|other), wildcard] (so most specified
+            # comes first)
+            dicts = [d.get(key) for d in dicts
+                        for key in [arg] + self._aliases[arg] + ['*'] if key in d]
+        
+        # get the result
+        if 'return_all' in kwargs:
+            result = dicts
+        elif len(dicts):
+            result = dicts[0]
+        elif 'default' in kwargs:
+            result = kwargs['default']
+        else:
+            msg = "[{0}] not defined in {1}"
+            raise KeyError(msg.format(':'.join(args), self.filename))
+
+        # if the result is mutable make a copy of it to prevent accidental modification
+        # of the config dictionary
+        if isinstance(result, (dict, list)):
+            return copy.deepcopy(result)
+        else:  # immutable type
+            return result
+
+
+    @staticmethod
+    def sanitise(string):
+        # remove _all_ whitespace (matched by \s) and convert to lowercase
+        return re.sub(r"\s", "", string).lower()
+
+    @staticmethod
+    def as_list(string):
+        # transforms strings containing interior commas or newlines into a list
+        return [s.strip() for s in Parser.SPLITTER.split(string) if s.strip()]
+
+    @staticmethod
+    def process_tuple(label_val):
+        # given a label, value tuple (where label and value are both strings)
+        # attempts to interpret value as a python object using literal_eval
+        # and/or as a list (in the case that value contains interior newlines
+        # or commas)
+        def process_val(value):
+            # if literal_eval fails (eg if value really is a string) then return
+            # a cleaned-up resion. Note we do not want to apply any other transformation
+            # to value as eg case might be important
+            try:
+                return literal_eval(value)
+            except:
+                # it is a plain string or cannot be parsed so return as string
+                return value.strip()
+
+        label, val = label_val
+        # val strings at end of lines will have an \n so must strip them
+        val = val.strip()
+        if Parser.SPLITTER.search(val):  # val is a list of items
+            val = [process_val(v) for v in Parser.as_list(val)]
+        else:  # it is single value
+            val = process_val(val)
+
+        return (label, val)
+

=== modified file 'src/endroid/cron.py'
--- src/endroid/cron.py	2012-09-03 17:55:29 +0000
+++ src/endroid/cron.py	2013-08-12 17:50:48 +0000
@@ -11,46 +11,78 @@
 from pytz import timezone
 import logging
 
+
 class Task(object):
     """
     Wrapper object providing direct access to a specific "task".  Obtain an
     instance using register on the Cron singleton.
+
     """
-    __slot__ = ('name', 'cron')
+    __slots__ = ('name', 'cron')
+
     def __init__(self, name, cron):
         self.name = name
         self.cron = cron
+
     def doAtTime(self, time, locality, params):
         return self.cron.doAtTime(time, locality, self.name, params)
+
     def setTimeout(self, timedelta, params):
         return self.cron.setTimeout(timedelta, self.name, params)
 
+
 class Cron(object):
+    # a wrapper around the CronSing singleton
     cron = None
 
     @staticmethod
     def get():
-        if Cron.cron == None:
+        if Cron.cron is None:
             Cron.cron = CronSing()
         return Cron.cron
 
 
 class CronSing(object):
+    """
+    A singleton providing task scheduling facilities.
+    A function may be registered by calling .register(function, name)
+    and scheduled with either setTimeout(time, name, params) or
+    doAtTime(time, locality, name, params).
+    When it comes to be called, the function will be called with an argument
+    generated from params (so even if the function needs no arguments it should
+    provide one eg def foo(_) rather than def foo()
+
+    """
     def __init__(self):
         self.delayedcall = None
         self.fun_dict = {}
         self.db = Database('Cron')
+        # table for tasks which will be called after a certain amount of time
         if not self.db.table_exists('cron_delay'):
-            self.db.create_table('cron_delay', ['timestamp', 'fun_name', 'params'])
+            self.db.create_table('cron_delay', 
+                                 ['timestamp', 'reg_name', 'params'])
+        # table for tasks which will be called at a specific time
         if not self.db.table_exists('cron_datetime'):
-            self.db.create_table('cron_datetime', ['datetime', 'locality', 'fun_name', 'params'])
-    
+            self.db.create_table('cron_datetime', 
+                                 ['datetime', 'locality', 'reg_name', 'params'])
+
     def seconds_until(self, td):
-        return float((td.microseconds + (td.seconds + td.days * 24 * 3600) * 10**6)) / 10**6
-    
-    def register(self, fun, name):
-        self.fun_dict.update({name: fun})
-        return Task(name, self)
+        ds, ss, uss = td.days, td.seconds, td.microseconds
+        return float((uss + (ss + ds * 24 * 3600) * 10**6)) / 10**6
+
+    def register(self, function, reg_name, persistent=True):
+        """Register the callable fun against reg_name.
+
+        Allows callable to be scheduled with doAtTime or setTimeout."""
+        # reg_name is the key we use to access the function - we can then set the
+        # function to be called using setTimeout or doAtTime with regname = name
+
+        # remove any prior functions with this reg_name
+        if not persistent:
+            self.removeTask(reg_name)
+
+        self.fun_dict.update({reg_name: function})
+        return Task(reg_name, self)
 
     def cancel(self):
         if self.delayedcall:
@@ -61,14 +93,14 @@
         if self.delayedcall:
             self.delayedcall.cancel()
         self.delayedcall = reactor.callLater(0, self._do_crons)
-    
+
     def _time_left_delay(self, pickleTime):
         curtime = datetime.datetime.now(timezone('GMT'))
         dt = cPickle.loads(str(pickleTime))
         dt_gmt = dt.astimezone(timezone('GMT'))
         time_delta = dt_gmt - curtime
         return self.seconds_until(time_delta)
-    
+
     def _time_left_set_time(self, pickleTime, locality):
         curtime = datetime.datetime.now(timezone('GMT'))
         dt = cPickle.loads(str(pickleTime))
@@ -76,89 +108,131 @@
         dt_gmt = dt_local.astimezone(timezone('GMT'))
         time_delta = dt_gmt - curtime
         return self.seconds_until(time_delta)
-        
-    
+
     def _do_crons(self):
         self.delayedcall = None
-#        curtime = datetime.now(timezone('GMT'))
-        delays = self.db.fetch('cron_delay', ['timestamp', 'fun_name', 'params', 'rowid'])
-        set_times = self.db.fetch('cron_datetime', ['datetime', 'fun_name', 'params', 'locality', 'rowid'])
-        
-#        crons = [{'table':'cron_delay', 'data':data, 'time_left': self.seconds_until(cPickle.loads(str(data['timestamp'])).astimezone(timezone('GMT')) - curtime)}  for data in delays ]
-#        crons = []
-#        for data in delays:
-#            dt = cPickle.loads(str(data['timestamp']))
-#            dt_gmt = dt.astimezone(timezone('GMT'))
-#            time_delta = dt_gmt - curtime
-#            time_left = self.seconds_until(time_delta)
-#            crons.append({'table':'cron_delay', 'data':data, 'time_left':time_left})
-#        
-#        for data in set_times:
-#            dt = cPickle.loads(str(data['datetime']))
-#            dt_local = timezone(data['locality']).localize(dt)
-#            dt_gmt = dt_local.astimezone(timezone('GMT'))
-#            time_delta = dt_gmt - curtime
-#            time_left = self.seconds_until(time_delta)
-#            crons.append({'table':'cron_datetime', 'data':data, 'time_left':time_left})
-        
-#        crons_s = [{'table':'cron_datetime', 'data':data, 'time_left': self.seconds_until(timezone(data['locality']).localize(cPickle.loads(str(data['datetime']))).astimezone(timezone('GMT')) - curtime)} for data in set_times]
+        # retrieve the information about our two kinds of scheduled tasks from
+        # the database
+        delays = self.db.fetch('cron_delay', 
+                               ['timestamp', 'reg_name', 'params', 'rowid'])
+        set_times = self.db.fetch('cron_datetime', 
+                                  ['datetime', 'reg_name', 'params', 
+                                   'locality', 'rowid'])
+
+        # transform the two types of data into a consistant format and combine
+        # data is the raw information we retrieved from self.db
         crons_d = [{
             'table':     'cron_delay',
             'data':      data,
             'time_left': self._time_left_delay(data['timestamp'])
-        }  for data in delays]
+        } for data in delays]
         crons_s = [{
             'table':     'cron_datetime',
             'data':      data,
-            'time_left': self._time_left_set_time(data['datetime'], data['locality'])
+            'time_left': self._time_left_set_time(data['datetime'], 
+                                                  data['locality'])
         } for data in set_times]
         crons = crons_d + crons_s
-        
+
         shortest = None
-        
+
+        # run all crons with time_left <= 0, find smallest time_left amongst
+        # others and reschedule ourself to run again after this time
         for cron in crons:
             if cron['time_left'] <= 0:
+                # the function is ready to be called
+                # remove the entry from the database and call it
                 self.db.delete(cron['table'], cron['data'])
-                logging.info("Running Cron: " + cron['data']['fun_name'])
-                self.fun_dict[cron['data']['fun_name']](cPickle.loads(str(cron['data']['params'])))
+                logging.info("Running Cron: " + cron['data']['reg_name'])
+                params = cPickle.loads(str(cron['data']['params']))
+                try:
+                    self.fun_dict[cron['data']['reg_name']](params)
+                except KeyError:
+                    # If there has been a restart we will have lost our fun_dict
+                    # If functions have not been re-registered then we will have a problem.
+                    logging.error("Failed to run Cron: {} not in dictionary".format(cron['data']['reg_name']))
             else:
-                if (shortest == None) or cron['time_left'] < shortest:
+                # update the shortest time left
+                if (shortest is None) or cron['time_left'] < shortest:
                     shortest = cron['time_left']
-        if not shortest == None:
+        if not shortest is None:  #ie there is another function to be scheduled
             self.delayedcall = reactor.callLater(shortest, self._do_crons)
 
-    def doAtTime(self, time, locality, fun_name, params):
+    def doAtTime(self, time, locality, reg_name, params):
+        """
+        Start a cron job to trigger the specified function ('reg_name') with the
+        specified arguments ('params') at time ('time', 'locality').
+
+        """
         lTime = timezone(locality).localize(time)
         gTime = lTime.astimezone(timezone('GMT'))
-        
-        logging.info("Cron task \"" + fun_name + "\" set for " + str(lTime) + " (" + str(gTime) + " in GMT)")
-        t,p = self._pickleTimeParams(time, params)
-        
-        self.db.insert('cron_datetime', {'datetime': t, 'locality': locality, 'fun_name': fun_name, 'params': p})
+
+        fmt = "Cron task '{}' set for {} ({} GMT)"
+        logging.info(fmt.format(reg_name, lTime, gTime))
+        t, p = self._pickleTimeParams(time, params)
+
+        self.db.insert('cron_datetime', {'datetime': t, 'locality': locality, 
+                                         'reg_name': reg_name, 'params': p})
         self.do_crons()
-    
-    
+
     def setTimeout(self, timedelta, reg_name, params):
         """
-        Start a cron job to trigger the specified registration ('reg_name') with the
-        specified arguments ('params') after the specified delay ('timedelta').
+        Start a cron job to trigger the specified registration ('reg_name') with
+        specified arguments ('params') after delay ('timedelta').
 
         timedelta may either be a datetime.timedelta object, or a real number
-        representing a number of seconds to wait. Negative or 0 values will trigger
-        near immediately.
+        representing a number of seconds to wait. Negative or 0 values will 
+        trigger near immediately.
+
         """
         if not isinstance(timedelta, datetime.timedelta):
             timedelta = datetime.timedelta(seconds=timedelta)
-        logging.info('Cron task "{0}" set to run after {1}'.format(reg_name,
-                                                                   str(timedelta)))
+
+        fmt = 'Cron task "{0}" set to run after {1}'
+        logging.info(fmt.format(reg_name, str(timedelta)))
+
         time = datetime.datetime.now(timezone('GMT')) + timedelta
-        
         t, p = self._pickleTimeParams(time, params)
-        
-        self.db.insert('cron_delay', {'timestamp': t, 'fun_name': reg_name,
-                                      'params': p})        
+
+        self.db.insert('cron_delay', {'timestamp': t, 'reg_name': reg_name,
+                                      'params': p})
         self.do_crons()
-    
-        
+
+    def removeTask(self, reg_name):
+        """Remove any scheduled tasks registered with reg_name."""
+        self.db.delete('cron_delay', {'reg_name': reg_name})
+        self.db.delete('cron_datetime', {'reg_name': reg_name})
+        self.fun_dict.pop('reg_name', None)
+
+    def getAtTimes(self):
+        """
+        Return a string showing the registration names of functions scheduled
+        with doAtTime and the amount of time they will be called in.
+
+        """
+        def get_single_string(data):
+            fmt = "  name '{}' to run in '{}:{}:{}'"
+            name = data['reg_name']
+            delay = int(round(self._time_left_set_time(data['datetime'], data['locality'])))
+            return fmt.format(name, delay // 3600, (delay % 3600) // 60, delay % 60)
+
+        data = self.db.fetch('cron_datetime', ['reg_name', 'locality', 'datetime'])
+        return "Datetime registrations:\n" + '\n'.join(map(get_single_string, data))
+
+    def getTimeouts(self):
+        """
+        Return a string showing the registration names of functions scheduled
+        with setTimeout and the amount of time they will be called in.
+
+        """
+        def get_single_string(data):
+            fmt = "  name '{}' to run in '{}:{}:{}'"
+            name = data['reg_name']
+            delay = int(round(self._time_left_delay(data['timestamp'])))
+            return fmt.format(name, delay // 3600, (delay % 3600) // 60, delay % 60)
+
+        data = self.db.fetch('cron_delay', ['reg_name', 'timestamp'])
+        return "Timeout registrations:\n" + '\n'.join(map(get_single_string, data))
+
     def _pickleTimeParams(self, time, params):
         return cPickle.dumps(time), cPickle.dumps(params)

=== modified file 'src/endroid/database.py'
--- src/endroid/database.py	2012-08-09 09:06:58 +0000
+++ src/endroid/database.py	2013-08-12 17:50:48 +0000
@@ -27,6 +27,12 @@
         return self[EndroidUniqueID]
 
 class Database(object):
+    """Wrapper round an sqlite3 Database
+
+    All accesses are synchronous, TODO use twisted.enterprise.adbapi to 
+    asynchronise them.
+
+    """
     connection = None
     cursor = None
     file_name = None

=== added file 'src/endroid/manhole.py'
--- src/endroid/manhole.py	1970-01-01 00:00:00 +0000
+++ src/endroid/manhole.py	2013-08-12 17:50:48 +0000
@@ -0,0 +1,37 @@
+from twisted.cred import portal, checkers
+from twisted.conch import manhole, manhole_ssh
+from twisted.internet import reactor
+import logging
+
+def manhole_factory(nmspace, **passwords):
+    realm = manhole_ssh.TerminalRealm()
+
+    def getManhole(_):
+        return manhole.Manhole(nmspace)
+
+    realm.chainedProtocolFactory.protocolFactory = getManhole
+    p = portal.Portal(realm)
+    p.registerChecker(
+        checkers.InMemoryUsernamePasswordDatabaseDontUse(**passwords)
+    )
+    f = manhole_ssh.ConchFactory(p)
+    return f
+
+# how to log in: ssh user_name@localhost -p port
+def start_manhole(droid, nmspace, cliargs):
+    """Start EnDroid listening for an ssh connection.
+
+    Logging in via ssh gives access to a python prompt from which EnDroid's
+    internals can be investigated.
+
+    Login details are specified in the cliargs tuple, which contains:
+    (login_name, login_password, port)
+
+    """
+    logging.info("Starting manhole")
+    # room to expand / add functionality to the manhole_dict here
+    manhole_dict = dict(locals().items() + globals().items())
+    login, password, port = cliargs
+    reactor.listenTCP(int(port), manhole_factory(nmspace, **{login: password}))
+    droid.run()
+ 

=== modified file 'src/endroid/messagehandler.py'
--- src/endroid/messagehandler.py	2012-09-01 23:15:55 +0000
+++ src/endroid/messagehandler.py	2013-08-12 17:50:48 +0000
@@ -5,152 +5,203 @@
 # -----------------------------------------
 
 import logging
-
-PRIORITY_NORMAL = 0
-PRIORITY_URGENT = -1
-PRIORITY_BULK = 1
+from twisted.words.protocols.jabber.jid import JID
+
+
+class Handler(object):
+    __slots__ = ("name", "priority", "callback")
+    def __init__(self, priority, callback):
+        self.name = callback.__name__
+        self.priority = priority
+        self.callback = callback
+
+    def __str__(self):
+        return "{}: {}".format(self.priority, self.name)
+
 
 class MessageHandler(object):
-    def __init__(self, wh):
-        self._handlers = {}
+    """An abstraction of XMPP's message protocols."""
+
+    PRIORITY_NORMAL = 0
+    PRIORITY_URGENT = -1
+    PRIORITY_BULK = 1
+
+    def __init__(self, wh, um):
         self.wh = wh
+        self.um = um
+        # wh translates messages and gives them to us, needs to know who we are
         self.wh.set_message_handler(self)
-
-    def register_callback(self, typ, cat, key, callback,
-                          including_self=False, priority=0):
+        self._handlers = {}
+
+    def register_callback(self, name, typ, cat, callback,
+                          including_self=False, priority=PRIORITY_NORMAL):
+        """
+        Register a function to be called on receipt of a message of type 
+        'typ' (muc/chat), category 'cat' (recv, send, unhandled, *_self, *_filter)
+        sent from user or room 'name'.
+
+        """
+        # self._handlers is a dictionary of form:
+        # { type : { category : { room/groupname : [Handler objects]}}}
         typhndlrs = self._handlers.setdefault(typ, {})
         cathndlrs = typhndlrs.setdefault(cat, {})
-        handlers = cathndlrs.setdefault(key, [])
-        handlers.append((priority, callback))
-        handlers.sort()
+        handlers = cathndlrs.setdefault(name, [])
+        handlers.append(Handler(priority, callback))
+        handlers.sort(key=lambda h: h.priority)
+
+        # this callback be called when we get messages sent by ourself
         if including_self:
-            self.register_callback(typ, cat + "_self", key, callback,
+            self.register_callback(name, typ, cat + "_self", callback,
                                    priority=priority)
 
-    def register_muc_handler(self, rjid, handler, including_self=False, priority=0):
-        self.register_callback("muc", "recv", rjid, handler, including_self, priority)
-
-    def register_chat_handler(self, users, handler, including_self=False, priority=0):
-        for user in users:
-            self.register_callback("chat", "recv", user, handler, including_self, priority)
-
-    def register_unhandled_muc_handler(self, rjid, handler, including_self=False,
-                                       priority=0):
-        self.register_callback("muc", "unhandled", rjid, handler, including_self, priority)
-
-    def register_unhandled_chat_handler(self, users, handler, including_self=False,
-                                        priority=0):
-        for user in users:
-            self.register_callback("chat", "unhandled", user, handler, including_self, priority)
-
-    def register_muc_recv_filter(self, rjid, handler, priority=0):
-        self.register_callback("muc", "recv_filter", rjid, handler, priority=priority)
-
-    def register_chat_recv_filter(self, users, handler, priority=0):
-        for user in users:
-            self.register_callback("chat", "recv_filter", user, handler, priority=priority)
-
-    def register_muc_send_filter(self, rjid, handler, priority=0):
-        self.register_callback("muc", "send_filter", rjid, handler, priority=priority)
-
-    def register_chat_send_filter(self, users, handler, priority=0):
-        for user in users:
-            self.register_callback("chat", "send_filter", user, handler, priority=priority)
-
-    def do_callback(self, typ, cat, key, msg, failback):
-        handlers = self._handlers.get(typ, {}).get(cat, {})
-        filters = self._handlers.get(typ, {}).get(cat + "_filter", {})
-        if key in handlers and all(f(msg) for p, f in filters.get(key, [])):
+    def get_handlers(self, typ, cat, name):
+        dct = self._handlers.get(typ, {}).get(cat, {})
+        if typ == 'chat':  # we need to lookup name's groups
+            # we may have either a full jid or just a userhost,
+            # groups are referenced by userhost
+            name = self.um.get_userhost(name)
+            handlers = []
+            for name in self.um.get_groups(name):
+                handlers.extend(dct.get(name, []))
+            handlers.sort(key=lambda h: h.priority)
+            return handlers
+        else:  # we are in a room so only one set of handlers to read
+            return dct.get(name, [])
+
+    def get_filters(self, typ, cat, name):
+        return self.get_handlers(typ, cat+"_filter", name)
+
+    def do_callback(self, cat, msg, failback):
+        if msg.place == "muc":
+            # get the handlers active in the room - note that these are already
+            # sorted (sorting is done in the register_callback method)
+            handlers = self.get_handlers(msg.place, cat, msg.recipient)
+            filters = self.get_filters(msg.place, cat, msg.recipient)
+        else: 
+            # combine the handlers from each group the user is registered with
+            # note that if the same plugin is registered for more than one of
+            # the user's groups, the plugin's instance in each group will be
+            # called
+            handlers = self.get_handlers(msg.place, cat, msg.sender)
+            filters = self.get_filters(msg.place, cat, msg.sender)
+   
+        log_list = []
+        if handlers and all(f.callback(msg) for f in filters):
             msg.set_unhandled_cb(failback)
-            for i in handlers[key]:
+
+            for i in handlers:
                 msg.inc_handlers()
-            for pri, cb in handlers[key]:
+
+            log_list.append("Did {} {} handlers (priority: cb):".format(len(handlers), cat))
+            for handler in handlers:
                 try:
-                    cb(msg)
+                    handler.callback(msg)
+                    log_list.append(str(handler))
                 except Exception as e:
-                    logging.error("Exception occurred in callback: {0}".format(str(e)))
-                    msg.unhandled()
+                    log_list.append("Exception in {}:\n{}".format(handler.name, e))
+                    msg.dec_handlers()
                     raise
         else:
             failback(msg)
+        if log_list:
+            logging.info("\n\t".join(log_list))
 
     def _unhandled_muc(self, msg):
-        self.do_callback("muc", "unhandled", msg.rjid.userhost(), msg, lambda m: None)
+        self.do_callback("unhandled", msg, lambda m: None)
 
     def _unhandled_self_muc(self, msg):
-        self.do_callback("muc", "unhandled_self", msg.rjid.userhost(), msg,
-                         lambda m: None)
+        self.do_callback("unhandled_self", msg, lambda m: None)
 
+    # Do normal (recv) callbacks on msg. If no callbacks handle the message
+    # then call unhandled callbacks (msg's failback is set self._unhandled_...
+    # by the last argument to do_callback).
     def receive_muc(self, msg):
-        self.do_callback("muc", "recv", msg.rjid.userhost(), msg, self._unhandled_muc)
+        self.do_callback("recv", msg, self._unhandled_muc)
 
     def receive_self_muc(self, msg):
-        self.do_callback("muc", "recv_self", msg.rjid.userhost(), msg,
-                         self._unhandled_self_muc)
+        self.do_callback("recv_self", msg, self._unhandled_self_muc)
 
     def _unhandled_chat(self, msg):
-        self.do_callback("chat", "unhandled", msg.sender.userhost(), msg,
-                         lambda m: None)
+        self.do_callback("unhandled", msg, lambda m: None)
 
     def _unhandled_self_chat(self, msg):
-        self.do_callback("chat", "unhandled_self", msg.sender.userhost(), msg,
-                         lambda m: None)
+        self.do_callback("unhandled_self", msg, lambda m: None)
 
     def receive_chat(self, msg):
-        self.do_callback("chat", "recv", msg.sender.userhost(), msg,
-                         self._unhandled_chat)
+        self.do_callback("recv", msg, self._unhandled_chat)
 
     def receive_self_chat(self, msg):
-        self.do_callback("chat", "recv_self", msg.sender.userhost(), msg,
-                         self._unhandled_self_chat)
-
-    def send_muc(self, rjid, text, source, priority=PRIORITY_NORMAL):
-        filters = self._handlers.get("muc", {}).get("send_filter", {})
-        msg = Message('muc', source, text, self, recipient=rjid, rjid=rjid)
-        if all(f(msg) for p, f in filters.get(rjid.userhost(), [])):
-            self.wh.groupChat(rjid, text)
-
-    def send_chat(self, user, text, source, priority=PRIORITY_NORMAL):
-        filters = self._handlers.get("chat", {}).get("send_filter", {})
-        msg = Message('chat', source, text, self, recipient=user)
-        if all(f(msg) for p, f in filters.get(user.userhost(), [])):
-            self.wh.chat(user, text)
+        self.do_callback("recv_self", msg, self._unhandled_self_chat)
+
+    def send_muc(self, room, body, source=None, priority=PRIORITY_NORMAL):
+        """Send muc message to room.
+
+        The message will be run through any registered filters before it is sent.
+
+        """
+        msg = Message('muc', source, body, self, recipient=room)
+        # when sending messages we check the filters registered with the
+        # _recipient_. Cf. when we receive messages we check filters registered
+        # with the _sender_.
+        filters = self.get_filters('muc', 'send', msg.recipient)
+
+        if all(f.callback(msg) for f in filters):
+            logging.info("Sending message to {}".format(room))
+            self.wh.groupChat(JID(room), body)
+        else:
+            logging.info("Filtered out message to {}".format(room))
+
+    def send_chat(self, user, body, source=None, priority=PRIORITY_NORMAL):
+        """Send chat message to person with address user.
+
+        The message will be run through any registered filters before it is sent.
+
+        """
+        msg = Message('chat', source, body, self, recipient=user)
+        filters = self.get_filters('chat', 'send', msg.recipient)
+
+        if all(f.callback(msg) for f in filters):
+            logging.info("Sending message to {}".format(user))
+            self.wh.chat(JID(user), body)
         else:
             logging.info("Filtered out message to {0}".format(user))
 
-    
+
 class Message(object):
-    def __init__(self, mtype, sender, body, messagehandler, 
-                 recipient=None, handlers=0, rjid=None, sendernick=None,
-                 priority=PRIORITY_NORMAL):
-        self.mtype = mtype
-        self.sender = sender
-        self.sendernick = sendernick
+    def __init__(self, place, sender, body, messagehandler, recipient, handlers=0,
+                 priority=MessageHandler.PRIORITY_NORMAL):
+        self.place = place
+
+        # sender_full is a string representing the full jid (including resource)
+        # of the message's sender. Used in reply methods so that if a user is
+        # logged in on several resources, the reply will be sent to the right one
+        self.sender_full = sender
+        # a string represeting the userhost of the message's sender. Used to
+        # lookup resource-independant user properties eg their registered rooms
+        self.sender = messagehandler.um.get_userhost(sender)
         self.body = body
         self.recipient = recipient
+
+        # a count of plugins which will try to process this message
         self.__handlers = handlers
-        self.rjid = rjid
         self.messagehandler = messagehandler
         self.priority = priority
 
     def send(self):
-        if self.mtype == "chat":
+        if self.place == "chat":
             self.messagehandler.send_chat(self.recipient, self.body, self.sender)
-        elif self.mtype == "muc":
+        elif self.place == "muc":
             self.messagehandler.send_muc(self.recipient, self.body, self.sender)
 
     def reply(self, body):
-        if self.mtype == "chat":
-            self.messagehandler.send_chat(self.sender, body, self)
-        elif self.mtype == "muc":
-            self.messagehandler.send_muc(self.rjid, body, self)
+        if self.place == "chat":
+            self.messagehandler.send_chat(self.sender_full, body, self.recipient)
+        elif self.place == "muc":
+            # we send to the room (the recipient), not the message's sender
+            self.messagehandler.send_muc(self.recipient, body, self.recipient)
 
     def reply_to_sender(self, body):
-        self.messagehandler.send_chat(self.sender, body, self)
-
-    def prepare_response(self, tojid, message, ismuc=False):
-        return Message('muc' if ismuc else 'chat', self.recipient, message,
-                       self.messagehandler, recipient=tojid)
+        self.messagehandler.send_chat(self.sender_full, body, self.recipient)
 
     def inc_handlers(self):
         self.__handlers += 1
@@ -158,7 +209,7 @@
     def dec_handlers(self):
         self.__handlers -= 1
         self.do_unhandled()
-    
+
     def unhandled(self, *args):
         """
         Notify the message that the caller hasn't handled it. This should only
@@ -167,12 +218,14 @@
 
         This method takes arbitrary arguments so it can be used as deferred
         callback or errback.
+
         """
         self.dec_handlers()
-    
+
     def do_unhandled(self):
         if self.__handlers == 0 and hasattr(self, 'unHandledCallback'):
             self.unHandledCallback(self)
-    
+
     def set_unhandled_cb(self, cb):
         self.unHandledCallback = cb
+

=== modified file 'src/endroid/pluginmanager.py'
--- src/endroid/pluginmanager.py	2012-09-01 23:15:55 +0000
+++ src/endroid/pluginmanager.py	2013-08-12 17:50:48 +0000
@@ -6,8 +6,25 @@
 
 import sys
 import logging
-
-from endroid.messagehandler import PRIORITY_NORMAL
+from endroid.cron import Cron
+
+msg_filter_doc = ("Register a {0} filter for {1} messages.\n"
+    "Filter takes endroid.messagehandler.Message and returns bool. If its\n"
+    "return value evaluates to False, the message is dropped.\n"
+    "Priority specifies the order of calling - lower numbers = called earlier.\n")
+
+msg_send_doc = ("Send a {0} message to {1}, with given text and priority.\n"
+    "rjid is a string representing the JID of the room to send to.\n"
+    "text is a string (or unicode) of the message contents.\n"
+    "priority one of the PRIORITY_* constants from endroid.messagehandler.\n"
+    "(Use with care, especially PRIORITY_URGENT, which will usually bypass any\n"
+    "ratelimiting or other protections put in place.)")
+
+msg_cb_doc = ("Register a callback for {0} messages.\n"
+    "Callback takes endroid.messagehandler.Message and may alter it arbitrarily.\n"
+    "Inc_self specifies whether to do the callback if EnDroid created the message.\n"
+    "Priority specifies the order of calling - lower numbers = called earlier.\n")
+
 
 class PluginMeta(type):
     """
@@ -39,195 +56,142 @@
 
     def __init__(cls, name, bases, dict):
         type.__init__(cls, name, bases, dict)
+        cls.modname = cls.__module__
         PluginMeta.registry[cls.__module__] = cls
 
+
 class Plugin(object):
     """
     Parent class of all plugin objects within EnDroid. Plugins must subclass
     this type and it also represents the entry point for the plugin into the
     rest of EnDroid.
+
     """
     __metaclass__ = PluginMeta
-    
-    def suc_users(self):
-        return self._pm.suc_users()
-    
+
     def _pluginInit(self, pm, conf):
         self._pm = pm
+
+        self.messagehandler = pm.messagehandler
+        self.usermanagement = pm.usermanagement
+
+        self.place = pm.place
+        self.place_name = pm.name
         self.vars = conf
-    
-    # Quick and nasty integration of usermanagement without abstracting away
-    # functions.
-    
-    def presence(self):
-        return self._pm.usermanagement.presence
+
+    def _register(self, *args, **kwargs):
+        return self.messagehandler.register_callback(self._pm.name, *args, **kwargs)
 
     # Registration methods
-
-    def register_muc_callback(self, callback, including_self=False, priority=0):
-        if self._pm.rjid:
-            self._pm.register_muc_callback(callback, including_self=False, priority=priority)
-
-    def register_chat_callback(self, callback, including_self=False, priority=0):
-        if not self._pm.rjid:
-            self._pm.register_chat_callback(callback, including_self=False, priority=priority)
-
-    def register_unhandled_muc_callback(self, callback, including_self=False, priority=0):
-        if self._pm.rjid:
-            self._pm.register_unhandled_muc_callback(callback, including_self=False, priority=priority)
-    
-    def register_unhandled_chat_callback(self, callback, including_self=False, priority=0):
-        if not self._pm.rjid:
-            self._pm.register_unhandled_chat_callback(callback, including_self=False, priority=priority)
-
-    def register_muc_filter(self, callback, priority=0):
-        """
-        Register a receive filter for MUC messages. The specified callback is
-        called whenever a MUC message is received, allowing it to perform
-        either transformations on the message, and even choose to drop the
-        message completely.
-
-        callback is a callable that takes a single argument, which will be of
-        type endroid.messagehandler.Message, representing the received
-        message. If it returns a False value (including None), then the message
-        is dropped - no further filters will be called, and no handlers are
-        called.
-        priority allows a relative prioritisation of different filters. Lower
-        priority filters are run first. Within a priority level, filters are
-        run in the order they are registered.
-        """
-        if self._pm.rjid:
-            self._pm.register_muc_filter(callback, priority)
-
-    def register_chat_filter(self, callback, priority=0):
-        """
-        Register a receive filter for regular chat messages. The specified
-        callback is called whenever a chat message is received, allowing it to
-        perform either transformations on the message, and even choose to drop
-        the message completely.
-
-        callback is a callable that takes a single argument, which will be of
-        type endroid.messagehandler.Message, representing the received
-        message. If it returns a False value (including None), then the message
-        is dropped - no further filters will be called, and no handlers are
-        called.
-        priority allows a relative prioritisation of different filters. Lower
-        priority filters are run first. Within a priority level, filters are
-        run in the order they are registered.
-        """
-        if not self._pm.rjid:
-            self._pm.register_chat_filter(callback, priority)
-
-    def register_muc_send_filter(self, callback, priority=0):
-        """
-        Register a send filter for MUC messages. The specified callback is
-        called whenever a MUC message is about to be sent, allowing it to
-        perform either transformations on the message, and even choose to drop
-        the message completely.
-
-        callback is a callable that takes a single argument, which will be of
-        type endroid.messagehandler.Message, representing the message about to
-        be sent. If it returns a False value (including None), then the message
-        is dropped - no further filters will be called, and the message is not
-        sent on to the WokkelHandler.
-        priority allows a relative prioritisation of different filters. Lower
-        priority filters are run first. Within a priority level, filters are
-        run in the order they are registered.
-        """
-        if self._pm.rjid:
-            self._pm.register_muc_send_filter(callback, priority)
-
-    def register_chat_send_filter(self, callback, priority=0):
-        """
-        Register a send filter for regular chat messages. The specified
-        callback is called whenever a chat message is about to be sent,
-        allowing it to perform either transformations on the message, and even
-        choose to drop the message completely.
-
-        callback is a callable that takes a single argument, which will be of
-        type endroid.messagehandler.Message, representing the message about to
-        be sent. If it returns a False value (including None), then the message
-        is dropped - no further filters will be called, and the message is not
-        sent on to the WokkelHandler.
-        priority allows a relative prioritisation of different filters. Lower
-        priority filters are run first. Within a priority level, filters are
-        run in the order they are registered.
-        """
-        if not self._pm.rjid:
-            self._pm.register_chat_send_filter(callback, priority)
-
-    # Message send methods
-
-    def send_muc(self, rjid, text, priority=PRIORITY_NORMAL):
-        """
-        Send a MUC message to the specified room ('rjid'), with the given text
-        and at the specified priority.
-
-        rjid is a string representing the JID of the room to send to.
-        text is a string (or unicode) with the message contents.
-        priority specifies the priority of the message, and should be one of
-        the PRIORITY_* constants defined in endroid.messagehandler. Use with
-        care, especially PRIORITY_URGENT, which will usually bypass any
-        ratelimiting or other protections put in place.
-        """
-        self._pm.send_muc(rjid, text, self, priority)
-
-    def send_chat(self, user, text, priority=PRIORITY_NORMAL):
-        """
-        Send a regular chat message to the specified room ('rjid'), with the
-        given text and at the specified priority.
-
-        user is a string representing the JID of the user to send to.
-        text is a string (or unicode) with the message contents.
-        priority specifies the priority of the message, and should be one of
-        the PRIORITY_* constants defined in endroid.messagehandler. Use with
-        care, especially PRIORITY_URGENT, which will usually bypass any
-        ratelimiting or other protections put in place.
-        """
-        self._pm.send_chat(user, text, self, priority)
+    def register_muc_callback(self, callback, inc_self=False, priority=0):
+        if self._pm.place != "room":
+            return
+        self._register("muc", "recv", callback, inc_self, priority)
+
+    def register_chat_callback(self, callback, inc_self=False, priority=0):
+        if self._pm.place != "group":
+            return
+        self._register("chat", "recv", callback, inc_self, priority)
+
+
+    def register_unhandled_muc_callback(self, callback, inc_self=False, priority=0):
+        if self._pm.place != "room":
+            return
+        self._register("muc", "unhandled", callback, inc_self, priority)
+
+    def register_unhandled_chat_callback(self, callback, inc_self=False, priority=0):
+        if self._pm.place != "group":
+            return
+        self._register("chat", "unhandled", callback, inc_self, priority)
+
+    register_muc_callback.__doc__ = msg_cb_doc.format("muc")
+    register_chat_callback.__doc__ = msg_cb_doc.format("chat")
+    register_unhandled_muc_callback.__doc__ = msg_cb_doc.format("unhandled muc")
+    register_unhandled_chat_callback.__doc__ = msg_cb_doc.format("unhandled chat")
+
+    def register_muc_filter(self, callback, inc_self=False, priority=0):
+        if self._pm.place != "room":
+            return
+        self._register("muc", "recv_filter", callback, inc_self, priority)
+
+    def register_chat_filter(self, callback, inc_self=False, priority=0):
+        if self._pm.place != "group":
+            return
+        self._register("chat", "recv_filter", callback, inc_self, priority)
+
+    def register_muc_send_filter(self, callback, inc_self=False, priority=0):
+        if self._pm.place != "room":
+            return
+        self._register("muc", "send_filter", callback, inc_self, priority)
+
+    def register_chat_send_filter(self, callback, inc_self=False, priority=0):
+        if self._pm.place != "group":
+            return
+        self._register("chat", "send_filter", callback, inc_self, priority)
+
+    register_muc_filter.__doc__ = msg_filter_doc.format("receive", "muc")
+    register_chat_filter.__doc__ = msg_filter_doc.format("receive", "chat")
+    register_muc_send_filter.__doc__ = msg_filter_doc.format("send", "muc")
+    register_chat_send_filter.__doc__ = msg_filter_doc.format("send", "chat")
 
     # Plugin access methods
-
     def get(self, plugin_name):
+        """Return a plugin-like object from the plugin module plugin_name."""
         return self._pm.get(plugin_name)
 
     def get_dependencies(self):
-        return map(self.get, self.dependencies)
+        """Return an iterable of plugins this plugin depends on.
+
+        This includes indirect dependencies i.e. the dependencies of plugins this
+        plugin depends on and so on.
+
+        """
+        return (self.get(dependency) for dependency in self.dependencies)
 
     def get_preferences(self):
-        return map(self.get, self.preferences)
-    
+        """Return an iterable of plugins this plugin prefers.
+
+        This includes indirect preferences i.e. the preferences of plugins this
+        plugin prefers and so on.
+
+        """        
+        return (self.get(preference) for preference in self.preferences)
+
     def list_plugins(self):
-        return self._pm.list()
-    
+        """Return a list of all plugins loaded in the plugin's environment."""
+        return self._pm.get_plugins()
+
     def pluginLoaded(self, modname):
+        """Check if modname is loaded in the plugin's environment (bool)."""
         return self._pm.hasloaded(modname)
-    
+
     def pluginCall(self, modname, func, *args, **kwargs):
+        """Directly call a method on plugin modname."""
         return getattr(self.get(modname), func)(*args, **kwargs)
 
-    # Default implementations of overridable methods
-
     def endroid_init(self):
         pass
 
+    @property
+    def cron(self):
+        return Cron().get()
+    
+
     dependencies = ()
     preferences = ()
 
+
 class PluginProxy(object):
     def __init__(self, modname):
-        logging.info(modname)
         __import__(modname)
+        # dictionary mapping module names to module objects
         m = sys.modules[modname]
-
         # In loading a plugin, we first look for a get_plugin() function,
         # then a function with the same name as the module, and finally we
         # just check the automatic Plugin registry for a Plugin defined in
         # that module.
         if hasattr(m, 'get_plugin'):
             self.module = getattr(m, 'get_plugin')()
-        elif hasattr(m, modname.split('.')[-1]):
-            self.module = getattr(m, modname.split('.')[-1])()
         else:
             self.module = PluginMeta.registry[modname]()
 
@@ -236,10 +200,10 @@
             return getattr(self.module, key)
         else:
             return self
-        
+
     def hasattr(self, key):
         return hasattr(self.module, key)
-    
+
     def __call__(self, *args, **kwargs):
         return self
 
@@ -251,113 +215,107 @@
     def __init__(self, value):
         super(ModuleNotLoadedError, self).__init__(value)
         self.value = value
+
     def __str__(self):
         return repr(self.value)
 
+
 class PluginInitError(Exception):
     pass
 
 
 class PluginManager(object):
-    def __init__(self, messagehandler, usermanagement, rjid=None, userlist=[]):
+    def __init__(self, messagehandler, usermanagement, place, name, config):
         self.messagehandler = messagehandler
         self.usermanagement = usermanagement
+
+        self.place = place
+        self.name = name
+
+        # this is a dictionary of plugin module names to pluginproxy objects
+        self._loaded = {}
+        # a dict of modnames : plugin configs
         self._plugins = {}
+        # module name to bool dictionary
         self.initialised = {}
-        self.rjid = rjid
-        self.userlist = userlist
-    
-    def suc_users(self):
-        return self.userlist
-    
-    def register_muc_callback(self, callback, including_self=False, priority=0):
-        self.messagehandler.register_muc_handler(self.rjid, callback,
-                                                 including_self, priority)
-        
-    def register_chat_callback(self, callback, including_self=False, priority=0):
-        self.messagehandler.register_chat_handler(self.userlist, callback,
-                                                  including_self, priority)
-        
-    def register_unhandled_muc_callback(self, callback, including_self=False, priority=0):
-        self.messagehandler.register_unhandled_muc_handler(self.rjid, callback,
-                                                           including_self, priority)
-        
-    def register_unhandled_chat_callback(self, callback, including_self=False, priority=0):
-        self.messagehandler.register_unhandled_chat_handler(self.userlist, callback,
-                                                            including_self, priority)
-
-    def register_muc_filter(self, callback, priority=0):
-        self.messagehandler.register_muc_recv_filter(self.rjid, callback, priority)
-
-    def register_chat_filter(self, callback, priority=0):
-        self.messagehandler.register_chat_recv_filter(self.userlist, callback,
-                                                      priority)
-
-    def register_muc_send_filter(self, callback, priority=0):
-        self.messagehandler.register_muc_send_filter(self.rjid, callback, priority)
-
-    def register_chat_send_filter(self, callback, priority=0):
-        self.messagehandler.register_chat_send_filter(self.userlist, callback,
-                                                      priority)
-
-    def send_muc(self, rjid, text, source, priority=PRIORITY_NORMAL):
-        self.messagehandler.send_muc(rjid, text, source, priority)
-
-    def send_chat(self, jid, text, source, priority=PRIORITY_NORMAL):
-        self.messagehandler.send_chat(jid, text, source, priority)
-    
-    def list(self):
+
+        self.read_config(config)
+        self.loadPlugins()
+        self.initPlugins()
+
+    def read_config(self, conf):
+        def get_data(modname):
+            # return a tuple of (modname, modname's config)
+            return modname, conf.get(self.place, self.name, "plugin", modname, default={})
+
+        plugins = conf.get(self.place, self.name, "plugins")
+        self._plugins = dict(map(get_data, plugins))
+
+    def get_plugins(self):
         return self._plugins.keys()
-    
-    def load(self, plugin, conf):
-        append = ""
-        if self.rjid:
-            append = " for room " + self.rjid
-        elif self.userlist:
-            append = " for users " + str(self.userlist)
-        logging.info("Loading Plugin: " + plugin + append)
+
+    def load(self, modname):
+        # loads the plugin module and adds a key to self._loaded
+        logging.debug("\tLoading Plugin: " + modname)
         try:
-            p = PluginProxy(plugin)
-            p._pluginInit(self, conf)
-            
-            self._plugins[plugin] = p
+            p = PluginProxy(modname)
+            p._pluginInit(self, self._plugins[modname])
+
+            self._loaded[modname] = p
         except ImportError as i:
             logging.error(i)
-            logging.error("**Could Not Import Plugin \"" + plugin + "\". Check That It Exists In Your PYTHONPATH.")
-
-    def get(self, name):
-        if not name in self._plugins:
-            raise ModuleNotLoadedError(name)
-        return self._plugins[name]
-    
+            logging.error("**Could Not Import Plugin \"" + modname
+                          + "\". Check That It Exists In Your PYTHONPATH.")
+
+    def loadPlugins(self):
+        logging.info("Loading Plugins for {0}".format(self.name))
+        plugins = self.get_plugins()
+        for p in plugins:
+            self.load(p)
+
     def hasloaded(self, name):
-        return self._plugins.has_key(name)
-    
+        return name in self._loaded
+
     def init(self, modname):
-        logging.debug("Initialising Plugin: " + modname)
-        if self.initialised.has_key(modname):
-            logging.debug(modname + " Already Initialised")
+        logging.debug("\tInitialising Plugin: " + modname)
+        if modname in self.initialised:
+            logging.debug("\t{0} Already Initialised".format(modname))
             return True
         if not self.hasloaded(modname):
-            logging.error("**Cannot Initialise Plugin \"" + modname + "\", It Has Not Been Imported")
+            logging.error("\t**Cannot Initialise Plugin \"" + modname + "\", It Has Not Been Imported")
             return False
 
+        # deal with dependencies and preferences
         plugin = self.get(modname)
-        for modname2 in plugin.dependencies:
-            logging.debug(modname + " Depends On " + modname2 + "...")
-            if not self.init(modname2):
-                logging.error("**No \"" + modname2 + "\". Unloading " + modname)
-                self._plugins.pop(modname)
+        for mod_dep_name in plugin.dependencies:
+            logging.debug("\t{0} Depends On {1}".format(modname, mod_dep_name))
+            if not self.init(mod_dep_name):
+                # can't possibly initialise us so remove us from self._loaded
+                logging.error("\t**No \"" + mod_dep_name + "\". Unloading " + modname)
+                self._loaded.pop(modname)
                 return False
-        for modname2 in plugin.preferences:
-            logging.debug(modname + " Prefers To Have " + modname2 + "...")
-            if not self.init(modname2):
-                logging.error("**Could Not Load " + modname2)
+
+        for mod_pref_name in plugin.preferences:
+            logging.debug("\t{0} Prefers {1}".format(modname, mod_pref_name))
+            if not self.init(mod_pref_name):
+                logging.error("\t**Could Not Load " + mod_pref_name)
+        # attempt to initialise the plugin
         try:
             plugin.endroid_init()
             self.initialised[modname] = True
-            logging.info("Initialised Plugin: " + modname)
-        except PluginInitError as e:
-            logging.error("**Error initializing \"" + modname + "\".  See log for details.")
+            logging.info("\tInitialised Plugin: " + modname)
+        except PluginInitError:
+            logging.error("\t**Error initializing \"" + modname + "\".  See log for details.")
             return False
         return True
+
+    def initPlugins(self):
+        logging.info("Initialising Plugins for {0}".format(self.name))
+        plugins = self.get_plugins()
+        for p in plugins:
+            self.init(p)
+
+    def get(self, name):
+        if not name in self._loaded:
+            raise ModuleNotLoadedError(name)
+        return self._loaded[name]

=== modified file 'src/endroid/plugins/blacklist.py'
--- src/endroid/plugins/blacklist.py	2012-09-02 19:58:56 +0000
+++ src/endroid/plugins/blacklist.py	2013-08-12 17:50:48 +0000
@@ -7,7 +7,6 @@
 from endroid.pluginmanager import Plugin
 from endroid.database import Database
 from endroid.cron import Cron
-from endroid.config import as_list
 
 # DB constants
 DB_NAME = "Blacklist"
@@ -26,14 +25,15 @@
     help = "Maintain a blacklist of JIDs who get ignored by EnDroid."
     hidden = True
 
+    _blacklist = set()
+
     def endroid_init(self):
         """
         Initialise the plugin, and recover the blacklist from the DB.
         """
-        self.admins = set(map(str.strip, as_list(self.vars.get("admins", ""))))
-        self._blacklist = set()
+        self.admins = set(map(str.strip, self.vars.get("admins", [])))
 
-        self.cron = Cron.get().register(self.unblacklist, CRON_UNBLACKLIST)
+        self.task = self.cron.register(self.unblacklist, CRON_UNBLACKLIST)
 
         self.register_muc_filter(self.checklist)
         self.register_chat_filter(self.checklist)
@@ -45,20 +45,23 @@
             self.db.create_table(DB_TABLE, ("userjid",))
         for row in self.db.fetch(DB_TABLE, ("userjid",)):
             self.blacklist(row["userjid"])
+
+    def get_blacklist(self):
+        return self._blacklist
         
     def checklist(self, msg):
         """
         Receive filter callback - checks the message sender against the
         blacklist
         """
-        return msg.sender.userhost() not in self._blacklist
+        return msg.sender not in self.get_blacklist()
 
     def checksend(self, msg):
         """
         Send filter callback - checks the message recipient against the
         blacklist
         """
-        return msg.recipient.userhost() not in self._blacklist
+        return msg.sender not in self.get_blacklist()
 
     def command(self, msg):
         """
@@ -70,13 +73,14 @@
         while len(parts) < 3:
             parts.append(None)
         bl, cmd, user = parts[:3]
-        if msg.sender.userhost() in self.admins and bl == "blacklist":
-            if cmd == "add" and user not in self._blacklist:
+
+        if msg.sender in self.admins and bl == "blacklist":
+            if cmd == "add" and user not in self.get_blacklist():
                 self.blacklist(user)
-            elif cmd == "remove" and user in self._blacklist:
+            elif cmd == "remove" and user in self.get_blacklist():
                 self.unblacklist(user)
             elif cmd == "list":
-                msg.reply("Blacklist: " + ", ".join(self._blacklist))
+                msg.reply("Blacklist: " + ", ".join(self.get_blacklist() or ['None']))
             else:
                 msg.unhandled()
         else:
@@ -88,15 +92,15 @@
         argument is passed, the user is removed after the specified number of
         seconds.
         """
+        self.db.delete(DB_TABLE, {"userjid": user})
+        self.db.insert(DB_TABLE, {"userjid": user})
         self._blacklist.add(user)
-        self.db.delete(DB_TABLE, {"userjid": user})
-        self.db.insert(DB_TABLE, {"userjid": user})
         if duration != 0:
-            self.cron.setTimeout(duration, user)
+            self.task.setTimeout(duration, user)
 
     def unblacklist(self, user):
         """
         Remove the specified user from the blacklist.
         """
-        self._blacklist.discard(user)
         self.db.delete(DB_TABLE, {"userjid": user})
+        self._blacklist.remove(user)

=== modified file 'src/endroid/plugins/command.py'
--- src/endroid/plugins/command.py	2012-09-02 23:03:10 +0000
+++ src/endroid/plugins/command.py	2013-08-12 17:50:48 +0000
@@ -4,13 +4,12 @@
 # Created by Jonathan Millican
 # -----------------------------------------
 
-import logging
-
 from collections import namedtuple
 from endroid.pluginmanager import Plugin, PluginMeta
 
 __all__ = (
     'CommandPlugin',
+    'command',
     )
 
 # A single registration
@@ -26,13 +25,52 @@
 # - subcommands is a dict of subcommand (simple str) to Handlers object
 Handlers = namedtuple('Handlers', ('handlers', 'subcommands'))
 
+def command(wrapped=None, synonyms=(), helphint="", hidden=False, chat_only=False,
+            muc_only=False):
+    """
+    Decorator used to mark command functions in subclasses of CommandPlugin.
+
+    In it's simplest form, can be used to mark a function as a command:
+
+        >>> class Foo(CommandPlugin):
+        ...     @command
+        ...     def foo_bar(self, msg, args):
+        ...         do_stuff_here()
+
+    This will register the command string ("foo", "bar") with the Command plugin
+    when the Foo plugin is initialised.
+
+    The decorator also takes a series of optional keyword arguments to control
+    the behaviour of the registration:
+
+        synonyms: sequence of synonyms (either strings, or sequences of strings)
+        helphint: a helpful hint to display in help for the command
+        hidden: whether the command is hidden in the help
+        chat_only: set to True if the command should only be registered in chat
+        muc_only: set to True if the command should only be registered in muc
+
+    """
+    def decorator(fn):
+        fn.is_command = True
+        fn.synonyms = synonyms
+        fn.helphint = helphint
+        fn.hidden = hidden
+        fn.chat_only = chat_only
+        fn.muc_only = muc_only
+        return fn
+    if wrapped is None:
+        return decorator
+    else:
+        return decorator(wrapped)
+
 class CommandPluginMeta(PluginMeta):
     """
     Metaclass to support simple command-driven plugins. This should not be used
     directly, but rather by subclassing from CommandPlugin rather than Plugin.
     """
     def __new__(meta, name, bases, dct):
-        cmds = dict((c, f) for c, f in dct.items() if c.startswith("cmd_"))
+        cmds = dict((c, f) for c, f in dct.items()
+                    if c.startswith("cmd_") or getattr(f, "is_command", False))
         init = dct.get('endroid_init', lambda _: None)
         def endroid_init(self):
             com = self.get('endroid.plugins.command')
@@ -43,7 +81,10 @@
                     reg_fn = com.register_muc
                 else:
                     reg_fn = com.register_both
-                reg_fn(getattr(self, cmd), cmd.split("_")[1:],
+                words = cmd.split("_")
+                if not getattr(fn, "is_command", False):
+                    words = words[1:]
+                reg_fn(getattr(self, cmd), words,
                        helphint=getattr(fn, "helphint", ""),
                        hidden=getattr(fn, "hidden", False),
                        synonyms=getattr(fn, "synonyms", ()))
@@ -51,17 +92,20 @@
         dct['endroid_init'] = endroid_init
         dct['dependencies'] = tuple(dct.get('dependencies', ()) +
                                     ('endroid.plugins.command',))
-        return PluginMeta.__new__(meta, name, bases, dct)
+        return super(CommandPluginMeta, meta).__new__(meta, name, bases, dct)
 
 class CommandPlugin(Plugin):
     """
     Parent class for simple command-driven plugins. Such plugins don't need to
     explicitly register their commands. Instead, they can just define methods
-    prefixed with "cmd_" and they will automatically be registered. Any
-    additional underscores in the method name will be converted to spaces in
-    the registration (so cmd_foo_bar is registered as ('foo', 'bar')).
-
-    In addition, certain options can be passed by adding fields to the methods:
+    prefixed with "cmd_" or decorated with the 'command' decorator, and they
+    will automatically be registered. Any additional underscores in the method
+    name will be converted to spaces in the registration (so cmd_foo_bar is
+    registered as ('foo', 'bar')).
+
+    In addition, certain options can be passed by adding fields to the methods,
+    or as keyword arguments to the decorator:
+
     - hidden: don't show the command in help if set to True.
     - synonyms: an iterable of alternative keyword sequences to register the
         method against. All synonyms are hidden.
@@ -171,19 +215,19 @@
     # -------------------------------------------------------------------------
     # Registration methods
 
-    def register_handler(self, callback, cmd, helphint, hidden, handlers,
+    def _register_handler(self, callback, cmd, helphint, hidden, handlers,
                          synonyms=()):
         """
         Register a new handler.
 
         callback is the callback handle to call.
         command is either a single keyword, or a sequence of keywords to match.
-        helphint and hidden are argument to the Registration object.
+        helphint and hidden are arguments to the Registration object.
         handlers are the top-level handlers to add the registration to.
         """
         # Register any synonyms (done before we frig with the handlers)
         for entry in synonyms:
-            self.register_handler(callback, entry, helphint, True, handlers)
+            self._register_handler(callback, entry, helphint, True, handlers)
 
         # Allow simple commands to be passed as strings
         cmd = cmd.split() if isinstance(cmd, (str, unicode)) else cmd
@@ -196,13 +240,13 @@
     def register_muc(self, callback, command, helphint="", hidden=False,
                      synonyms=()):
         """Register a new handler for MUC messages."""
-        self.register_handler(callback, command, helphint, hidden,
+        self._register_handler(callback, command, helphint, hidden,
                               self._muc_handlers, synonyms)
     
     def register_chat(self, callback, command, helphint="", hidden=False,
                       synonyms=()):
         """Register a new handler for chat messages."""
-        self.register_handler(callback, command, helphint, hidden,
+        self._register_handler(callback, command, helphint, hidden,
                               self._chat_handlers, synonyms)
 
     def register_both(self, callback, command, helphint="", hidden=False,

=== modified file 'src/endroid/plugins/compute/__init__.py'
--- src/endroid/plugins/compute/__init__.py	2012-08-09 12:39:52 +0000
+++ src/endroid/plugins/compute/__init__.py	2013-08-12 17:50:48 +0000
@@ -16,7 +16,7 @@
 import wap
 
 # Constants for the DB values we use
-WOLFRAM_API_SERVER_DEFAULT = "http://api.wolframalpha.com/v1/query.jsp"
+WOLFRAM_API_SERVER_DEFAULT = "http://api.wolframalpha.com/v2/query"
 
 MESSAGES = {
 'help' : """
@@ -44,7 +44,7 @@
             self.waeo = wap.WolframAlphaEngine(self.api_key, self.server)
         except KeyError:
             logging.error("ERROR: Compute: There is no API key set in config!  Set 'api_key' variable"
-                  "in section '[Plugin:endroid.plugins.compute]'.  Aborting plugin load.")
+                  " in section '[Plugin:endroid.plugins.compute]'.  Aborting plugin load.")
             raise PluginInitError("Aborted plugin initialization")
 
     def help(self):

=== modified file 'src/endroid/plugins/compute/wap.py' (properties changed: +x to -x)
=== modified file 'src/endroid/plugins/correct.py'
--- src/endroid/plugins/correct.py	2012-09-04 11:33:50 +0000
+++ src/endroid/plugins/correct.py	2013-08-12 17:50:48 +0000
@@ -58,5 +58,6 @@
             # This is unexpected. Probably a mistake on the user's part?
             msg.unhandled()
         else:
-            who = msg.sendernick if msg.sendernick else "You"
+            sendernick = self.usermanagement.get_nickname(msg.sender, self.place_name)
+            who = sendernick if self.place == "muc" else "You"
             msg.reply("%s meant: %s" % (who, newstr))

=== modified file 'src/endroid/plugins/echobot.py'
--- src/endroid/plugins/echobot.py	2012-09-02 19:58:56 +0000
+++ src/endroid/plugins/echobot.py	2013-08-12 17:50:48 +0000
@@ -7,7 +7,7 @@
 from endroid.pluginmanager import Plugin
 
 class EchoBot(Plugin):
-    def endroid_plugin(self):
+    def endroid_init(self):
         self.register_chat_callback(self.do_echo)
         self.register_muc_callback(self.do_echo)
     

=== modified file 'src/endroid/plugins/httpinterface.py'
--- src/endroid/plugins/httpinterface.py	2012-11-26 20:31:52 +0000
+++ src/endroid/plugins/httpinterface.py	2013-08-12 17:50:48 +0000
@@ -3,7 +3,6 @@
 # Copyright 2012, Ensoft Ltd
 # -----------------------------------------------------------------------------
 
-import cgi
 import collections
 import re
 
@@ -12,7 +11,8 @@
 from twisted.web.resource import Resource
 from twisted.web.server import Site
 
-HTTP_PORT = 8880
+DEFAULT_HTTP_PORT = 8880
+DEFAULT_HTTP_INTERFACE = '127.0.0.1'
 
 NOT_FOUND_TEMPLATE = """
 <html>
@@ -112,10 +112,10 @@
             re_src = re.escape(path_prefix) + r"(/.*)?"
         self.register_regex_path(plugin, callback, re_src)
         
-    def endroid_init(self):
+    def endroid_init(self, port, interface):
         self.root = IndexPage(self)
         factory = Site(self.root)
-        reactor.listenTCP(HTTP_PORT, factory)
+        reactor.listenTCP(port, factory, interface=interface)
 
 class HTTPInterface(Plugin):
     """
@@ -159,5 +159,7 @@
         
     def endroid_init(self):
         if not HTTPInterface.enInited:
-            HTTPInterface.object.endroid_init()
+            port = self.vars.get("port", DEFAULT_HTTP_PORT)
+            interface = self.vars.get("interface", DEFAULT_HTTP_INTERFACE)
+            HTTPInterface.object.endroid_init(port, interface)
             HTTPInterface.enInited = True

=== added file 'src/endroid/plugins/invite.py'
--- src/endroid/plugins/invite.py	1970-01-01 00:00:00 +0000
+++ src/endroid/plugins/invite.py	2013-08-12 17:50:48 +0000
@@ -0,0 +1,121 @@
+from endroid.plugins.command import CommandPlugin
+import shlex
+
+def parse_string(string, options=None):
+    """
+    Parse a shell command like string into an args tuple and a kwargs dict.
+
+    Options is an iterable of string tuples, each tuple representing a keyword
+    followed by its synonyms.
+
+    Words in string will be appended to the args tuple until a keyword is
+    reached, at which point they will be appended to a list in kwargs.
+
+    Eg parse_string("a b c -u 1 2 3 -r 5 6", [("-u",), ("room", "-r")])
+    will return: ('a', 'b', 'c'), {'-u': ['1','2','3'], 'room': ['5','6']}
+
+    """
+    options = options or []
+    aliases = {}
+
+    keys = []
+    # build the kwargs dict with all the keywords and an aliases dict for synonyms
+    for option in options:
+        if isinstance(option, (list, tuple)):
+            main = option[0]
+            keys.append(main)
+            for alias in option[1:]:
+                aliases[alias] = main
+        elif isinstance(option, (str, unicode)):
+            keys.append(option)
+
+    args = []
+    kwargs = {}
+    current = None
+    # parse the string - first split into shell 'words'
+    parts = shlex.split(string)
+    # then add to args or the kwargs dictionary as appropriate
+    for part in parts:
+        # if it's a synonym get the main command, else leave it
+        part = aliases.get(part, part)
+        if part in keys:
+            # we have come to a keyword argument - create its list
+            kwargs[part] = []
+            # keep track of where we are sending non-keyword words to
+            current = kwargs[part]
+        elif current is not None:
+            # we are adding words to a keyword's list
+            current.append(part)
+        else:
+            # no keywords has been found yet - we are still in args
+            args.append(part)
+
+    return args, kwargs
+
+def replace(l, search, replace):
+    return [replace if item == search else item for item in l]
+
+
+class Inviter(CommandPlugin):
+    help = "Invite users to rooms"
+    name = "invite"
+    PARSE_OPTIONS = ("to", "into")
+
+    def cmd_invite_me(self, msg, arg):
+        """
+        Invite user to the rooms listed in args, or to all their rooms 
+        if args is empty.
+
+        """
+        args, kwargs = parse_string(arg, self.PARSE_OPTIONS)
+        users = [msg.sender]
+        rooms = set(args + kwargs.get("to", [])) or ["all"]
+
+        results = self._do_invites(users, rooms)
+        msg.reply(results)
+    cmd_invite_me.helphint = "{to|into}? <room>+"
+
+    def cmd_invite_all(self, msg, arg):
+        """Invite all of a room's registered users to the room."""
+        users = self.usermanagement.get_available_users(self.place_name)
+        rooms = [self.place_name]
+
+        results = self._do_invites(users, rooms)
+        msg.reply(results)
+    cmd_invite_all.muc_only = True
+    cmd_invite_all.helphint = "<reason>"
+
+    def cmd_invite_users(self, msg, arg):
+        """Invite a list of users to a list of rooms."""
+        args, kwargs = parse_string(arg, self.PARSE_OPTIONS)
+        users = replace(args, "me", msg.sender)
+        rooms = kwargs.get("to", [])
+
+        results = self._do_invites(users, rooms)
+        msg.reply(results)
+    cmd_invite_users.helphint = "<user>+ {to|into} <room>+"
+
+    def _do_invites(self, users, rooms):
+        if 'all' in users:
+            if len(rooms) == 1:
+                users = self.usermanagement.get_available_users(rooms[0])
+            else:
+                return "Can only invite 'all' users to a single room"
+        if 'all' in rooms:
+            if len(users) == 1:
+                rooms = self.usermanagement.get_rooms(users[0])
+                if not rooms:
+                    return "User '{}' is not registered.".format(users[0])
+            else:
+                return "Can only invite a single user to 'all' rooms"
+
+        results = []
+        invitations = 0
+        for room in rooms:
+            for user in users:
+                s, reason = self.usermanagement.invite(user, room)
+                if not s:
+                    results.append("{} to {} failed: {}".format(user, room, reason))
+                else:
+                    invitations += 1
+        return "Sent {} invitations\n".format(invitations) + '\n'.join(results)

=== modified file 'src/endroid/plugins/memo.py'
--- src/endroid/plugins/memo.py	2012-09-04 15:10:26 +0000
+++ src/endroid/plugins/memo.py	2013-08-12 17:50:48 +0000
@@ -8,8 +8,7 @@
 See MESSAGES['usage'] for details.
 """
 
-import endroid.messagehandler as messagehandler
-from endroid.pluginmanager import Plugin
+from endroid.plugins.command import CommandPlugin, command
 from endroid.database import Database
 from endroid.database import EndroidUniqueID
 
@@ -27,11 +26,12 @@
 memo usage - Output this message
 memo [list] - List messages in inbox
 memo send <recipient> <message> - Send a message
-memo {view|delete} <message-id> -Handle a specific message""",
+memo {view|delete} <message-id> - Handle a specific message""",
 
     'usage-send' : "memo send <recipient> <message> \t Send a message",
     'usage-view' : "memo view <message-id> \t View a specific message",
     'usage-delete' : "memo delete <message-id> \t Delete a specific message",
+
     'duplicate-id-error' : "Error: There are messages sharing the same PK id",
     'id-not-found-error' : "There is no message with id {0}.  Try 'memo list'.",
     'deletion-sucess' : "Sucessfully deleted one message",
@@ -45,33 +45,21 @@
     }
 
 
-class Memo(Plugin):
+class Memo(CommandPlugin):
     name = "memo"
-    
-    def dependencies(self):
-        return ('endroid.plugins.command',)
-    
-    def enInit(self):
-        com = self.get('endroid.plugins.command')
-        com.register_chat(self._handle_list, 'memo', '[list]')
-        com.register_chat(self._handle_list, ('memo', 'list'), hidden=True)
-        com.register_chat(self._handle_send, ('memo', 'send'),
-                          '<recipient> <message>')
-        com.register_chat(self._handle_view, ('memo', 'view'), '<message-id>')
-        com.register_chat(self._handle_delete, ('memo', 'delete'),
-                          '<message-id>')
-        com.register_chat(lambda m, _: m.reply(MESSAGES['usage']),
-                          ('memo', 'usage'))
+    help_topics = {
+        '': lambda _: MESSAGES['help'],
+        'usage': lambda _: MESSAGES['usage'],
+        'send': lambda _: MESSAGES['usage-send'],
+        'view': lambda _: MESSAGES['usage-view'],
+        'delete': lambda _: MESSAGES['usage-delete'],
+    }
+    
+    def endroid_init(self):
         self.db = Database(DB_NAME)
-        self.setup_db()
-
-    def setup_db(self):
         if not self.db.table_exists(DB_TABLE):
             self.db.create_table(DB_TABLE, DB_COLUMNS)
 
-    def help(self):
-        return MESSAGES['help']
-
     def _message_text_summary(self, text):
         # First assume text is too long, try to shorten.
         summary = ""
@@ -82,8 +70,13 @@
             summary += word + ' '
         # Looks like memo is already short enough.  Return it.
         return summary[:-1]
-     
-    def _handle_delete(self, msg, args):
+
+    @command
+    def memo_usage(self, msg, args):
+        msg.reply(MESSAGES['usage'])
+
+    @command(helphint="<message-id>")
+    def memo_delete(self, msg, args):
         args = args.split()
         if len(args) != 1 or not args[0].isdigit():
             msg.reply(MESSAGES['usage-delete'])
@@ -100,9 +93,17 @@
             self.db.delete(DB_TABLE, {EndroidUniqueID : int(args[0])})
             msg.reply(MESSAGES['deletion-sucess'])
 
-    def _handle_list(self, msg, args):
+    @command(helphint="[list]")
+    def memo(self, msg, args):
+        args = args.split()
+        if len(args) > 0 and args[0] in {"send", "view", "delete", "usage"}:
+            msg.unhandled()
+            return
+        if len(args) > 1 or (len(args) == 1 and args[0] != "list"):
+            msg.reply(MESSAGES['usage'])
+            return
         memos = []
-        cond = {"recipient" : msg.sender.userhost()}
+        cond = {"recipient" : msg.sender}
         rows = self.db.fetch(DB_TABLE, DB_COLUMNS, cond)
         for row in rows:
             data = (row.id, row["sender"],
@@ -115,7 +116,8 @@
         else:
             msg.reply(MESSAGES['inbox-empty'])
     
-    def _handle_view(self, msg, args):
+    @command(helphint="<message-id>")
+    def memo_view(self, msg, args):
         args = args.split()
         if len(args) != 1 or not args[0].isdigit():
             msg.reply(MESSAGES['usage-view'])
@@ -133,18 +135,19 @@
             data = (row["sender"], row["text"])
             msg.reply(MESSAGES['view-message'].format(*data))
 
-    def _handle_send(self, msg, args):
+    @command(helphint="<recipient> <message>")
+    def memo_send(self, msg, args):
         args = args.split()
         if len(args) < 2:
             msg.reply(MESSAGES['usage-send'])
             return
 
         recipient, memo = args[0], ' '.join(args[1:])
-        if recipient not in self.presence().get_roster():
+        if recipient not in self.usermanagement.get_available_users():
             msg.reply(MESSAGES['bad-recipient'].format(recipient))
             return
 
-        self.db.insert(DB_TABLE, {'sender':    msg.sender.userhost(),
+        self.db.insert(DB_TABLE, {'sender':    msg.sender,
                                   'recipient': recipient,
                                   'text':      memo})
         msg.reply(MESSAGES['sent-message'])

=== added file 'src/endroid/plugins/passthebomb.py'
--- src/endroid/plugins/passthebomb.py	1970-01-01 00:00:00 +0000
+++ src/endroid/plugins/passthebomb.py	2013-08-12 17:50:48 +0000
@@ -0,0 +1,211 @@
+from endroid.plugins.command import CommandPlugin
+from endroid.cron import Cron
+from collections import defaultdict
+from endroid.database import Database
+
+DB_NAME = "PTB"
+DB_TABLE = "PTB"
+
+class User(object):
+    __slots__ = ('name', 'kills', 'shield')
+    def __init__(self, name, kills=0, shield=True):
+        self.name = name
+        self.kills = kills
+        self.shield = shield
+
+    def __repr__(self):
+        fmt = "User(name={}, kills={}, shield={})"
+        return fmt.format(self.name, self.kills, self.shield)
+
+class Bomb(object):
+    ID = 0
+    def __init__(self, source, fuse, plugin):
+        self.source = source  # who lit the bomb?
+        self.user = None  # our current holder
+        self.plugin = plugin  # plugin instance we belong to
+        self.history = set()  # who has held us?
+
+        idstring = self.get_id()  # get a unique registration_name
+        plugin.cron.register(self.explode, idstring)
+        plugin.cron.setTimeout(fuse, idstring, None)  # schedule detonation
+
+    # this function is called by Cron and given an argument. We don't need an
+    # argument so just ignore it
+    def explode(self, _):
+        # some shorthands
+        get_rooms = self.plugin.usermanagement.get_available_rooms
+        send_muc = self.plugin.messagehandler.send_muc
+        send_chat = self.plugin.messagehandler.send_chat
+
+        msg_explode = "!!!BOOM!!!"
+        msg_farexplode = "You hear a distant boom"
+        msg_kill = "{} was got by the bomb"
+
+        rooms = get_rooms(self.user)
+        for room in rooms:
+            # let everyone in a room with self.user here the explosion
+            send_muc(room, msg_explode)
+            send_muc(room, msg_kill.format(self.user))
+
+        # alert those who passed the bomb that it has exploded
+        for user in self.history:
+            if user == self.user:
+                send_chat(self.user, msg_explode)
+                send_chat(self.user, msg_kill.format("You"))
+            else:
+                send_chat(user, msg_farexplode)
+                send_chat(user, msg_kill.format(self.user))
+
+        self.plugin.register_kill(self.source)
+        self.plugin.bombs[self.user].discard(self)
+
+
+    def throw(self, user):
+        # remove this bomb from our current user
+        self.plugin.bombs[self.user].discard(self)
+
+        self.history.add(user)
+        self.user = user
+
+        # add it to the new user
+        self.plugin.bombs[self.user].add(self)
+
+    @classmethod
+    def get_id(cls):
+        # generate a unique id string to register our explode method against
+        result = Bomb.ID
+        cls.ID += 1
+        return "bomb" + str(result)
+
+
+class PassTheBomb(CommandPlugin):
+    help = "Pass the bomb game for EnDroid"
+    bombs = defaultdict(set)  # users : set of bombs
+    users = dict()  # user strings : User objects
+
+    def endroid_init(self):
+        self.db = Database(DB_NAME)
+        if not self.db.table_exists(DB_TABLE):
+            self.db.create_table(DB_TABLE, ('user', 'kills'))
+
+        # make a local copy of the registration database
+        data = self.db.fetch(DB_TABLE, ['user', 'kills'])
+        for dct in data:
+            self.users[dct['user']] = User(dct['user'], dct['kills'])
+
+    def cmd_furl_umbrella(self, msg, arg):
+        """This is how a user enters the game - allows them to be targeted
+        and to create and throw bombs"""
+        user = msg.sender
+        if not self.get_shielded(user):
+            msg.reply("Your umbrella is already furled!")
+        else:
+            if self.get_registered(user):
+                self.users[user].shield = False
+            else:  # they are not - register them
+                self.db.insert(DB_TABLE, {'user': user, 'kills': 0})
+                self.users[user] = User(user, kills=0, shield=False)
+            msg.reply("You furl your umbrella!")
+    cmd_furl_umbrella.helphint = ("Furl your umbrella to participate in the "
+                                  "noble game of pass the bomb!")
+
+    def cmd_unfurl_umbrella(self, msg, arg):
+        """A user with an unfurled umbrella cannot create or receive bombs"""
+        user = msg.sender
+        if self.get_shielded(user):
+            msg.reply("Your umbrella is already unfurled!")
+        else:
+            # to get user must not have been shielded ie they must have furled
+            # so they will be in the database
+            self.users[user].shield = True
+            msg.reply("You unfurl your umbrella! No bomb can reach you now!")
+    cmd_unfurl_umbrella.helphint = ("Unfurl your umbrella to cower from the "
+                                    "rain of boms!")
+
+    def cmd_bomb(self, msg, arg):
+        """Create a bomb with a specified timer.
+
+        eg: 'bomb 1.5' for a 1.5 second fuse
+
+        """
+
+        holder = msg.sender
+        if self.get_shielded(holder):
+            return msg.reply("Your sense of honour insists that you furl your "
+                              "umbrella before lighting the fuse")
+        # otherwise get a time from the first word of arg
+        try:
+            time = float(arg.split(' ', 1)[0])
+            # make a new bomb and throw it to its creator
+            Bomb(msg.sender, time, self).throw(msg.sender)
+            msg.reply("Sniggering evilly, you light the fuse...")
+        # provision for a failure to read a time float...
+        except ValueError:
+            msg.reply("You struggle with the matches")
+    cmd_bomb.helphint = ("Light the fuse!")
+
+    def cmd_throw(self, msg, arg):
+        """Throw a bomb to a user, eg: 'throw [e-mail]'"""
+        target = arg.split(' ')[0]
+        # we need a bomb to thrown
+        if not self.bombs[msg.sender]: 
+            msg.reply("You idly throw your hat, wishing you had something " 
+                       "rounder, heavier and with more smoking fuses.")
+        # need our umbrella to be furled
+        elif self.get_shielded(msg.sender):
+            msg.reply("You notice that your unfurled umbrella would hinder "
+                       "your throw.")
+        # check that target is online
+        elif not target in self.usermanagement.get_available_users():
+            msg.reply("You look around but cannot spot your target")
+        elif self.get_shielded(target):  # target registered/vulnerable?
+            msg.reply("You see your target hunkered down under their umbrella. "
+                       "No doubt a bomb would have little effect on that "
+                       "monstrosity.")
+        else:
+            self.bombs[msg.sender].pop().throw(target)
+            msg.reply("You throw the bomb!")
+            self.messagehandler.send_chat(target, "A bomb lands by your feet!")
+    cmd_throw.helphint = ("Throw a bomb!")
+
+    def cmd_kills(self, msg, arg):
+        kills = self.get_kills(msg.sender)
+        nick = self.usermanagement.get_nickname(msg.sender, 
+                                                     self.place_name)
+        level = self.get_level(kills)
+
+        text = "{} the {} has {} kill".format(nick, level, kills)
+        text += ("" if kills == 1 else "s")
+        msg.reply(text)
+    cmd_kills.helphint = ("Receive and gloat over you score!")
+
+    def register_kill(self, user):
+        kills = self.get_kills(user)
+        # change the value of 'kills' to kills+1 in the row where 'user' = user
+        self.users[user].kills += 1
+        self.db.update(DB_TABLE, {'kills': kills+1}, {'user': user})
+
+    def get_kills(self, user):
+        return self.users[user].kills if user in self.users else 0
+
+    def get_shielded(self, user):
+        return self.users[user].shield if user in self.users else True
+
+    def get_registered(self, user):
+        return user in self.users
+
+    @staticmethod
+    def get_level(kills):
+        if kills < 5:
+            level = 'novice'
+        elif kills < 15:
+            level = 'apprentice'
+        elif kills < 35:
+            level = 'journeyman'
+        elif kills < 65:
+            level = 'expert'
+        elif kills < 100:
+            level = 'master'
+        else:
+            level = 'grand-master'
+        return level

=== modified file 'src/endroid/plugins/ratelimit.py'
--- src/endroid/plugins/ratelimit.py	2012-08-31 09:59:16 +0000
+++ src/endroid/plugins/ratelimit.py	2013-08-12 17:50:48 +0000
@@ -6,11 +6,8 @@
 
 from collections import defaultdict, deque
 import time
-import logging
 
 from endroid.pluginmanager import Plugin
-from endroid.messagehandler import PRIORITY_URGENT
-from endroid.database import Database
 from endroid.cron import Cron
 
 # Cron constants
@@ -157,7 +154,7 @@
 
         self.waitingusers = set()
 
-        self.cron = Cron.get().register(self.sendagain, CRON_SENDAGAIN)
+        self.task = self.cron.register(self.sendagain, CRON_SENDAGAIN)
 
     def preferences(self):
         """Other plugins that we could use if they are loaded."""
@@ -183,7 +180,7 @@
 
         # Don't ratelimit things we're sending ourselves, or URGENT messages
         accept = (msg.sender is self or
-                  msg.priority == PRIORITY_URGENT or
+                  msg.priority == self.messagehandler.PRIORITY_URGENT or
                   sc.accept(msg, now))
         self.set_timeout(msg.recipient, now)
 
@@ -231,4 +228,4 @@
         sc = self.limiters[user]
         if len(sc.queue) > 0 and not user in self.waitingusers:
             self.waitingusers.add(user)
-            self.cron.setTimeout(self.fillrate / 1.0, user)
+            self.task.setTimeout(self.fillrate / 1.0, user)

=== modified file 'src/endroid/plugins/remote.py'
--- src/endroid/plugins/remote.py	2012-11-25 00:01:10 +0000
+++ src/endroid/plugins/remote.py	2013-08-12 17:50:48 +0000
@@ -3,13 +3,10 @@
 # Copyright 2012, Ensoft Ltd
 # -----------------------------------------------------------------------------
 
-import cgi
 import random
 import string
 import UserDict
 
-from twisted.words.protocols.jabber.jid import JID
-
 from endroid.database import Database
 from endroid.pluginmanager import Plugin
 
@@ -133,7 +130,7 @@
         return ''.join(random.choice(KEY_CHARS) for x in range(KEY_LENGTH))
 
     def allow(self, msg, arg):
-        jid = msg.sender.userhost()
+        jid = msg.sender
         if jid in self.keys:
             msg.reply("Remote notifications already allowed. (Your key is %s.)"
                         % self.keys[jid])
@@ -143,7 +140,7 @@
             msg.reply("Remote notifications allowed. Your key is %s." % key)
 
     def deny(self, msg, arg):
-        jid = msg.sender.userhost()
+        jid = msg.sender
         if jid in self.keys:
             del self.keys[jid]
             msg.reply("Remote notifications denied.")
@@ -193,9 +190,8 @@
             if request.method == 'POST':
                 self._validate_args(request.args)
 
-                self.send_chat(JID(request.args['user'][0]),
-                               "Remote notification received: %s" %
-                               request.args['message'][0])
+                self.messagehandler.send_chat(request.args['user'][0],
+                               "Remote notification received: %s" % request.args['message'][0])
                 header_msg = \
                     "<strong>Message delivered to %s</strong> <br />" % \
                             request.args['user'][0]

=== added file 'src/endroid/plugins/roomowner.py'
--- src/endroid/plugins/roomowner.py	1970-01-01 00:00:00 +0000
+++ src/endroid/plugins/roomowner.py	2013-08-12 17:50:48 +0000
@@ -0,0 +1,9 @@
+from endroid.pluginmanager import Plugin
+
+class RoomOwner(Plugin):
+    def endroid_init(self):
+        if self.place == "room":
+            # note that configure_room internally sanitises anything it gets
+            # - allowing only predefined keys and ignoring the rest (so giving it
+            # our whole .vars dictionary is safe (and easy))
+            self.usermanagement.configure_room(self.place_name, self.vars)

=== modified file 'src/endroid/plugins/speak.py'
--- src/endroid/plugins/speak.py	2012-08-13 20:27:02 +0000
+++ src/endroid/plugins/speak.py	2013-08-12 17:50:48 +0000
@@ -4,7 +4,6 @@
 # Created by Jonathan Millican
 # -----------------------------------------
 
-from twisted.words.protocols.jabber.jid import JID
 from endroid.pluginmanager import Plugin
 
 class Speak(Plugin):
@@ -20,16 +19,16 @@
     
     def do_speak(self, msg, args):
         tojid, text = self.split(args)
-        if tojid in self.suc_users():
-            self.send_chat(JID(tojid), text)
+        if tojid in self.usermanagement.users.available:
+            self.messagehandler.send_chat(tojid, text, msg.sender)
         else:
             msg.reply("You can't send messages to that user. Sorry.")
 
     def do_many_speak(self, msg, args):
         count, tojid, text = args.split(' ', 2)
-        if tojid in self.suc_users():
+        if tojid in self.usermanagement.users.available:
             for i in range(int(count)):
-                self.send_chat(JID(tojid), text)
+                self.messagehandler.send_chat(tojid, text, msg.sender)
         else:
             msg.reply("You can't send messages to that user. Sorry.")
     

=== modified file 'src/endroid/plugins/whosonline.py'
--- src/endroid/plugins/whosonline.py	2012-08-16 01:29:06 +0000
+++ src/endroid/plugins/whosonline.py	2013-08-12 17:50:48 +0000
@@ -4,7 +4,6 @@
 # Created by Jonathan Millican
 # -----------------------------------------
 
-from twisted.words.protocols.jabber.jid import JID
 from endroid.pluginmanager import Plugin
 
 class WhosOnline(Plugin):
@@ -19,29 +18,17 @@
         com.register_chat(self.show_online, 'whosonline')
         com.register_muc(self.show_rooms_in, 'listrooms')
         com.register_chat(self.show_rooms_in, 'listrooms')
-        self.presence = self.presence()
     
     def show_online(self, msg, arg):
         msg.reply(self.online_list())
     
     def online_list(self):
-        out = ""
-        for i in self.presence.get_available():
-                out = out + "\n" + i.userhost()
-        return out
+        return '\n' + '\n'.join(self.usermanagement.get_available_users())
     
     def show_rooms_in(self, msg, arg):
-        if self.room_list():
-            msg.reply(self.room_list())
-        else:
-            msg.reply("I'm not in any rooms")
+        rooms = self.usermanagement.get_available_rooms() or ["I'm not in any rooms!"]
+        msg.reply('\n' + '\n'.join(rooms))
     
-    def room_list(self):
-        out = ""
-        for i in self.presence.get_rooms():
-            out = out + "\n" + i.userhost()
-        return out
-
     def help(self):
         return "What? No. My name's not important. You must come with me, or you'll be late."
 

=== modified file 'src/endroid/rosterhandler.py'
--- src/endroid/rosterhandler.py	2012-08-31 19:21:34 +0000
+++ src/endroid/rosterhandler.py	2013-08-12 17:50:48 +0000
@@ -4,62 +4,103 @@
 # Created by Jonathan Millican
 # -----------------------------------------
 
-import logging 
-
-from wokkel.xmppim import RosterClientProtocol, PresenceProtocol
-
-class RosterHandler(RosterClientProtocol, PresenceProtocol):
+import logging
+
+from twisted.words.protocols.jabber.jid import JID
+from wokkel.xmppim import RosterClientProtocol, PresenceClientProtocol, RosterItem
+
+
+class RosterHandler(RosterClientProtocol, PresenceClientProtocol):
     def __init__(self):
         RosterClientProtocol.__init__(self)
-        PresenceProtocol.__init__(self)
+        PresenceClientProtocol.__init__(self)
         self.deferred = None
-    
-    def set_usermanagement(self, um):
-        self.usermanagement = um
-    
+
+    def set_presence_handler(self, um):
+        self.um = um
+
     def setHandlerParent(self, parent):
         RosterClientProtocol.setHandlerParent(self, parent)
-        PresenceProtocol.setHandlerParent(self, parent)
+        PresenceClientProtocol.setHandlerParent(self, parent)
 
-    def set_loaded_handler(self, d):
+    def set_connected_handler(self, d):
         self.deferred = d
     
     def connectionInitialized(self):
         RosterClientProtocol.connectionInitialized(self)
-        PresenceProtocol.connectionInitialized(self)
+        PresenceClientProtocol.connectionInitialized(self)
+
+        def purge_roster(roster, self):
+            # roster.keys() is a list of the users we are currently friends with.
+            for user in (item.userhost() for item in roster.keys()):
+                # if they have been removed from config since our last start
+                if not user in self.um.users.registered: 
+                    # get rid of them
+                    self.um.users.deregister_user(user)  
+            return roster  # pass the roster on for further callbacks
+
         rosterd = self.reRoster()
+        rosterd.addCallback(purge_roster, self)
+
         if self.deferred:
             d, self.deferred = self.deferred, None
             rosterd.addCallback(d.callback)
         # Advertises as available - otherwise MUC will probably work
         # but SUC clients won't send messages on to EnDroid
-        self.available()
-    
+        self.set_available()
+
+    def set_available(self, entity=None):
+        super(RosterHandler, self).available(entity)
+        
     def reRoster(self):
-        d = self.getRoster()
-        d.addCallback(self.usermanagement.got_roster)
-        return d
-
-#######################
-# This version of EnDroid is designed to be bashful so
-# will simply ignore subscribe requests. Its contact list
-# is simply determined by the config file
-#######################
-#    def subscribeReceived(self, presence):
-#        PresenceProtocol.subscribeReceived(self, presence)
-#        # Accept subscription
-#        self.subscribed(presence.sender)
-#        # Send available
-#        self.available(presence.sender)
-#        # Add them
-#        UserManagement.add_contact(presence.sender)
-#        self.reRoster()
-        
+        return self.getRoster()
+
+    def setItem(self, name):
+        if isinstance(name, RosterItem):
+            super(RosterHandler, self).setItem(name)
+        elif isinstance(name, (str, unicode)):
+            super(RosterHandler, self).setItem(RosterItem(JID(name)))
+        else:
+            raise TypeError("RosterHandler.setItem got invalid type")
+
+    def removeItem(self, name):
+        logging.info("removeItem {}".format(name))
+        super(RosterHandler, self).removeItem(JID(name))
+
     def subscribedReceived(self, presence):
-        PresenceProtocol.subscribedReceived(self, presence)
-        self.available(presence.sender)
-        self.reRoster()
+        PresenceClientProtocol.subscribedReceived(self, presence)
+        logging.info("Subscription request from {}".format(presence.userhost()))
+        if presence.userhost() in self.um.users.registered:
+            # this is generated when someone has confirmed our subscription request
+            # send a subscription _confirmation_ back (== authorizing in pidgin)
+            # (a wokkel API)
+            self.subscribed(presence)
+        # let the presence know that we are available (this does not affect 
+        # subscription status)
+        self.set_available(presence)
         
     def probeReceived(self, presence):
-        PresenceProtocol.probeReceived(self, presence)
-        self.available()
+        PresenceClientProtocol.probeReceived(self, presence)
+        self.set_available()
+
+    def availableReceived(self, entity, show=None, statuses=None, priority=0):
+        userhost, full_jid = entity.userhost(), entity.full()
+        logging.info("Available from {} '{}' priority: '{}'".format(full_jid, show, priority))
+        # entity has come online - update our online set
+        if userhost in self.um.users.registered:
+            self.um.users.set_available(full_jid)
+            # make them available in their groups
+            for group in self.um.get_groups(userhost):
+                self.um.group_rosters[group].set_available(full_jid)
+
+    def unavailableReceived(self, entity, statuses=None):
+        userhost, full_jid = entity.userhost(), entity.full()
+        logging.info("Unavailable from {}".format(full_jid))
+        # entity has gone offline - update our online set
+        if userhost in self.um.users.available:
+            self.um.users.set_unavailable(full_jid)
+            # make them unavailable in their groups
+            for group in self.um.get_groups(userhost):
+                self.um.group_rosters[group].set_unavailable(full_jid)
+
+

=== modified file 'src/endroid/usermanagement.py'
--- src/endroid/usermanagement.py	2012-08-31 12:10:51 +0000
+++ src/endroid/usermanagement.py	2013-08-12 17:50:48 +0000
@@ -3,133 +3,537 @@
 # Copyright 2012, Ensoft Ltd.
 # Created by Jonathan Millican
 # -----------------------------------------
-from twisted.words.protocols.jabber.jid import JID
+
 import logging
-
-#
-# Note: in this file a fair bit is commented out. This is functionality
-#  that was deliberately removed early on, but should be restored in a
-#  later revision, once EnDroid's behaviour is more flexible. (e.g.
-#  joining and leaving rooms dynamically, as opposed to on load-time
-#  from the config file).
-#
-
-class Presence(object):
-    """
-    Object for plugins to access data from within UserManagement, without
-    exposing the lower level endroid functionality to plugins
-    """
-    def __init__(self, usermanagement):
-        self._usermanagement = usermanagement
-    
-    def get_available(self):
-        """
-        Returns the set of available contacts
-        """
-        return self._usermanagement.available
-    
-    def get_roster(self):
-        """
-        Returns the full roster
-        """
-        return self._usermanagement.roster
-    
-    def get_rooms(self):
-        """
-        Returns the set of rooms that EnDroid is in
-        """
-        return self._usermanagement.rooms
+from twisted.words.protocols.jabber.jid import JID, parse, InvalidFormat
+from twisted.words.protocols.jabber.error import StanzaError
+from endroid.pluginmanager import PluginManager
+from random import choice
+
+# we use ADJECTIVES to generate a random new nick if endroid's is taken
+ADJECTIVES = [
+    "affronted", "annoyed", "antagonized", "bitter", "chafed", "convulsed",
+    "cross", "displeased", "enraged", "exasperated", "ferocious", "fierce",
+    "fiery", "fuming", "furious", "galled", "hateful", "heated", "impassioned",
+    "incensed", "indignant", "inflamed", "infuriated", "irascible", "irate",
+    "ireful", "irritated", "maddened", "offended", "outraged", "provoked", 
+    "raging", "resentful", "splenetic", "storming", "vexed", "wrathful"]
+