More work on armor API, will fix armor object declarations before
continuing item API