Got a bunch of more stuff working