Add all data source and delegate method

 - though some of them commented out