Added important TODO info