Large rewrite might be necessary

As I went through the code, looking for a fix to #48, more and more issues cropped up.
Intermediate data structures are unnecessarily complex and unwieldy, many sections are unclear in purpose and function.
It might be better to just replace large parts of it.
I have started this in #49.