Working on integrating hotspot functionality