Syncing code so that I can work on Issue #9.