i think that's right. gonna merge & we can debug.