I had the right structure and things, but man that's difficult to do from pure recall memory, instead of what I usually do which is reason about existing code to adapt a model to new use cases.