Jeffdev2

Merging my latest data