Rewriting for sanity
additions
Progress! Compiles! Vaguely works, but crashes with more detailed typesetting!