- Constness
- Added my name to TODO comment