Changes to Gunslinger solution, as well as a bunch of changes I couldn't undo to other stuff...??