Reworked killer to use menus in place of the staging world. Took the opportunity to generally tidy & refactor.