New version of mock working (I think)