Added Event Class and Command 40% Done