misc wip to get integration working