[api fix bin] First pass at implementation is complete.