Finished implementing all event listeners.
Merge origin/master