Major API Overhaul
With focus on websockets