Made more progress.  Almost done with unresolved points stuff.