Further down shrink of code base with the inclusion of a loop to use default values, and a inclusion of the weapons table