revamped the data source a bit and got systematic and ecclesial controllers switched over
merging
merging new changes
Merge pull request #3 from boxenjim/master

merging in your changes and resubmitting pull request