branching version that works with the funding tables of the db. trunk will use the new tables with fundingpaths