Total rework...

WIP.