Refactored the extraneous classes into utils for now