Adding an important TODO note