TODOs for refactoring and copyright header updates.