first pass works
wip