Started working on  beacons and content