started having an arraylist of weapons that can be generically called
merge commit