TODO notes and restructuring