Made some util classes

To get that testing junk out of my other code