Fixed the stuff you took out, and maye added some stuff
Merge branch 'master' of https://github.com/moosemn456/lightwait