Little bit more progress. Not sure how much further I want to take the mocks.