More work on implementing walkthrough. Issue #114