@cardinot -- if you'd like please add a TODO for me :).