fiddled with the todo