Added TODO to think of solution without atom usage.