WIP, end to end funcitonal test

just finished a fiarly hairy refactor
wip
end to end test in place (usmb_test.go)