Continue to works on comments. Intermediate commit. working version