1st pass that passes tests