New parsing method, not quite done...
Merge branch 'master' of https://github.com/rhinosaurus/coolface