Two main fragments created
Merge branch 'gerard'