Start of getting rid of the ID's, need to use guids