Updates base on my first attempt to run this.