I am working on this code due to my Bluetooth refactoring, if there are any issues (or unclarities) I will them address them in my future PR.