Tons of work on armor API