Get partials working and fix vanilla