#419 work in progress.