Toan & Nikesh || Refactoring and adding partials