Pushed this so we can integrate the beacon and shit