Intermediary commit, working on issue #6