Yet anoth massive commit of not-yet-working code. The number of errors
have decreased substantially, though.