working with dev (still FUCKED UP)

Got it working with dev and added in the full Data file too.