Moving some of the mock stuff into the start point