completed TODOs; works!