Updated design and TODO production list