Annotated where to change

(Actually committing before merging from upstream, as this doesn't
compile.)
Completed draft changes for issue 35
Merge pull request #54 from sleepyMonad/issue_35

Issue 35