Adding TODO items
Updating copyright notice