Multiple Avatars (i.e. Photo and Company Logo)

Hi,

Bit of a newbie to Drupal here with moderate experience in PHP. I'm trying to figure out the best way to implement multiple Avatars for each user. The site I'm setting up is for an association of lawyers around the world. Each lawyer/law firm has a photo of the contact lawyer, and a logo image for the firm that will appear on their profile page and with any articles they submit. My goal is to allow these member users to upload their logo and their photo when editing their profiles.

I'd like to do it with a minimum amount of fuss, or potential conflicts with the core modules and future updates...

I've come up with some possible ways to proceed:

1. Add a 'logo' field to the user table, and then anywhere in the user.module I see a reference to the 'picture' field, I copy and paste the code and edit to refer to the 'logo' field. (so 'picture' and 'logo' would be identical code snippets)

2. I try and implement an 'image' field in the profile.module & user.module, which would allow me to create any number of avatar upload fields by making add field>image field an available option in administer>profiles

3. I ignore the profile/user modules for this particular 'feature' and create some type of CCK node type that acts as a substitute profile node, and is referred/related to through the user id. So a posted Article would be a CCK node type with 2 calculated fields that would reference the images in the "Profile" CCK node type via the user id (if that's even possible)..

4. Or something I haven't thought of yet..... any ideas?

Thanks for the help.

-Chris