More comments. Test class may need work