Big Commit. Changed to the ConnectableDevice class, making the list
management much easier.