Adds support for Issue 7. Still need to group ammo together, but the main task of sorting the modules has been completed