Updated with new webapp-prototype client code