Got rid of wrapvec and got first results that look good

Weird HEAP crash in debugger but release build runs fine