Better Beacons

Makes Beacons useful again!