Even more ambitious TODO.