Adding bluetooth connection stuff
Adding bluetooth connection stuff
Merge changes