Committing changes that lead up to Issue #3