Fix so that it correctly disengages waiting

Still need to make it engage correctly... i think
Replaced lost souls with doomfaces

Bit of refactoring as well