adding utils and changing around the consts to use the enum.