New utils class
Fixed a few things I guess