todo17 work in progress