first cut of Shiro integration