refactoring to new bluetooth stuff