Added more work on this.