Ok, the real final commit

Now it's ready! :D