new API wip
refactor.. first few tests passing
finish --regex