More work to front end exercise, changes to mocker