Make everything actually work. Another monolithic commit.