adding a TODO; just realized I didn't test my last batch of code at all.