Beacon v2

Done.