More comments. Still refactoring.