More work to make AppendixA go FAST

!!