Changed how the event tracker works to support delegation and a much cleaner adding and removal.