Began working on issue #99