Partial Classes

Updated files to use partial classes properly