Adding event-based engine
Adding CLI