almot finish adding *pxd files