Reworking killer to use menus in place of the staging world. Have taken the opportunity to generally tidy & refactor.