Update this TODO file for Velocity  :)
