re-organized partials, made everything easier for me