hopefully finished getting rid of valuetypecomperare stuff iwth Mapping<> tmeplate (test a bit more)