Checkpoint. Things don’t work right now, pushing anyways. Fixed some bugs, slowly working towards shortcut testing. Can I resist the urge to rewrite? We’ll see.