*Starting to move over into Neo4j database implementation