ContextRework: COMMENTS & TODOS