New armor

Most of it isn't used yet; I'm saving that work for #120.