Woops
Major rework of internals