catkinization progress.  Builds now.