new problem wip...
merge...