Continued work on event CLI