intermediate commit

builds, but only under test