reorg, cleanup
merge
more beta capture interface work
beta interface improvements