Closer to complete first draft of bijection