Removed solr, completed preliminary data model