Updated GDD and TODO