Still futzing with new armor system