Another code reorg... w commented sections, added add-dead-unit