Adds rough outline of TODOs and questions
comments out data source fields
adds depenedency to external data source module. updates field names
removes deprecated code
fixes taxonomy issues