it at least works now, partials not so much