made it into a struct