Merge pull request #83 from polynickglot/master

Update data-controller in preparation for sql query to be written