[refactor] Old API was, meh