Testing out partials. More clean up.