Using cypher style node syntax, improved parsing, cleaned up a bunch of hacks, looking much better