Added some stuff. Order is under construction
Merge branch 'master' of https://github.com/moosemn456/lightwait