Utility Consolidation

Moved various functions in.