it compiles and should work. Some code-style rewriting was done, but there
still is a portion of code to be fixed. Also missing diagnostic messages.