rewrite wip.. failing test