Updated the project to be a bit more Object Oriented instead of a global utility class