wip
wip
wip
more unit tests
helpers