Armor is almost done.  Just need to fix my workspace for testing.