Removing debug statements.
Adding todo notes.