Comments addressed

Closes #1.
I'll add a check if it's already there before stomping on it.