Beacon demo

Please review these changes @schilit 
Thanks.