working on getting the data right