v0.0.2x - (part 1) - adding comments