Adding commenting. Should make refactoring and abstracting fo #11 easier.