rolling back some cd ish, now in it's own branch until stable