better integration

wip