Added some comments, a class for the Events and started implementing the other parameter scheme