Direct map works. Implementing N-Way now