Splitting event into command/event
Minor tidying
Adding command