Whole bunch of commented lines.... needed ? if not, remove