Almost done with event functionality, need to finish adding events