More armor things.. still have a few bugs to fix