wrap rewrite

there is a bad bug in framework::wrap, I have no clue weather it is
stack or heap related, but it really does not matter since there is a
better way to do it anyways