Alright, there's a bit more to come here to fix some known bugs, but this is a good baseline to land.