Revert "Revert "beacon stuff""

This reverts commit aaf603c8d3c0a08cc3e1918b3a624d4add9c43c3.