Finished work on mock1 and mock2