Whole new world

OK, this should have gone as a dozen of commits, but it haven't.
Basically, A lot of new stuff and of course, it doesn't work.