redid commands, added events to one class.