Got back from break now working on this.