check TODO 1, that's where we need to be tinkering