event wait
Merge branch 'master' of github.com:Kevin-Bravo/349
did some work