onetoone mapping issues fixed (for now!) continuing to wrap up the config