Unfudge TODO's passing after jnthn's work of today