adding data upload stuff and things woo
merge