Refactor in preparation for PageCount sample
Add @Override annotation
Add PageCount sample app