added todo from eric's branch to mainline