Initial commit of work around API shape