WIP: Synching codebase with Section 4