More mocking. Some functionality. No tests still.