WIP: API Revamp