more work on armory