Get it all working with partials again… maybe