closes #1864

doing andrew's //todo's since 1991