refactoring
wip
wip
wip
wip
readme change for new multi api