adding in some code I already wrote and removing some of the dummy data