Rolling back 2 commits, which where not heading in the right way.
The current commit is still not satisfiying, but it's a reasonable
start.