Finished first draf of the new versions.

I'm sure that there is a lot of mistakes and things to iron out. But I
guess we can set a good milestone here.