Got some more stuff working