bit more stuff
more wip