Standardized API into Master

Oh boy!