Spent another couple hours today working on this.