Intermediate commit with some Neo4j work