Reworking killer to use menus in place of the staging world. Taking the opportunity to generally tidy & refactor; commented everything out.