Utilities file and refactor.... Need to fix the current errors