renamed test2.py to something a bit more meaningful...
Adding in legacy code from old util.py
renamed util2 to util; fixed up references.