Beacon v2

this doesn't belong here, does it?