Hello Everyone, made some changes to my pull request. How to move it forward? Want to see if design is ok to make some final code changes.

Thanks