fixed bad copy paste error. Added a new TODO feature.