wip, cli tests not passing
wip rewrite tests