More functionality, including a couple broken things :(