wip add mult test
wip: clean up code