Finishing TODOs in Section 3