yes, see the TODO, I shoulda todone it