Fixed an herp
consolidated data into data.h