brought a bit of fighting back in, this commit doesn't compile