Adding / deleting comments throughout now functional