More work at getting IAP revs
Encapsulate private methods a bit nicer
Working iap grid :-)