More work on webapi.