WIP pass more args both ways