Armory final touches