More changes and added some TODO items
Merging in work which was done collaboratively today.
Fix references and labels
Reintroduce the 'integration plan' chapter
Update LearnPAd template
more changes
forgot to commit one file