more componentized design
Merge pull request #4 from dimagi/data_format

more componentized design