Finished adding in events. More javadocs.