wip, naming issues found