More work on getting partials to have the right data