bug fixing
event engine changes

still glitchy
Working on events
Merge branch 'JonsBranch' into davidsBranch