out-commented everything, time to repair bugs