Mocks

I think it is time to merge th