Added comments scaffolding.