got some more stuff working