API overhaul

Herp derp.