Added TODO comments, organized header comments