First round of commenting in working code completed, nothing tested