Updating the repo with working changes from June.