Still works.  Add armor routines next