API2 Phase 2

OMG I DID IT.