Get a lot more stuff working