Complete rework of core wrapper, dropping oop idea