CJ's First pull request for review

First pull request for review.
Avoid inline comments.