Finished the initial comments
Waiting for peer review and feedback