New code should be mostly done. Just doing some cleanup and
reorganization.