Now some more stuff works