Finished Cypher and makefile