Moved TODO note as a DEV note