Latest changes

It contains some errors, but it runs at least :-)