Todo done (partly)
Add todo
Add todos
rm symbolic_ref() - no necessary for clarification