Added Utilities Class + Tests, Refactored More