Break utils out.  More changes to stuff.