decided to take another road
added the mapping and a builder, still to refactor