working on some more stuff