Got more working, but blocked on some parsing right now, and a bunch of weirdness in actual live tests