removing underscore dependency, John - i hope your testing is on point