API overhaul
Baseline to resume work from