Initial commit of first-party solution.