Rejigger todo's