Fleshing out WP7, most FIXME notes have been removed and replaced with first version.
merge branch 'master' of https://github.com/metagraph/metagraph