Added back two important TODO's