New wrap

WIP
changes for the new dom react
+ some more simplification (val ruby)