Issue #34: Step six partial implementation. Updated comments.