committing a new test and what I think is a working version...