WIP: Using wrappers for commands and events.