wip
more stuff
merge