Huge rewrite WIP
Trimming down
Ok, this time is for real do