added check to pass through comments
Added TODO list