ToolContextual: Working out the kinks.
ToolContextual: More bugfixes
ToolContextual: Simplified logic for add/toggle/remove