Initial rewrite of weapons logic