Sunday branch: polished version to be deployed and demoed.