Slight refactoring, initial (buggy) code for equipment selection and saving