Commented code

closes #2