NOTE: There is an API change as well to make this all simpler so be
sure to test with corresponding backend branch.