Add more John mangling, start refactoring weapon menus and counts