v4.1 submission.  Still need to code a few of the non-norm cases.