partial data.py api change(fix tomorrow)
redesigned data api
lol
merged from dev