Almost done

From my side I'm finished. Let somebody else read it and fix eventual
errors.