removed debugging statements, added todo