things build now. still test failures though.