WIP: domains and events mostly working nicely