Fixed partials. Now just need to format data