last commit before the google launchpad day demo, potentially unstable