some more work on this.