More work on sale workflow