ARC
Demo "shouldIncludeContact"
Code reorganization