Some general rework

Added several Emissary subclasses