[DAN THE MAN, TMO, BNASTY] We semi-fixed the issue with the events, but the test all run fine now
[DAN THE MAN, TMO, BUGLY] Making merge with commit
commit
commiting issues resolved