First commit on iPad! This has more changes to use thr new datasource.