post mock commit
I left notes for myself as to what is left to do.