Benny's changes dump
Attempt to cleanup
Connor's new wake command