Cool.  (said offline) - the complex section was re-copied verbatim from master