Partially integrated comments
Second attempt at comments
Final comments commit, now working