Added some mocks. These aren't final