add a couple more TODOs
got interpolated parameters and inline stuff working pretty well.