>It will take me 10 years to refactor all places where I have code in the event method (e.g. cmdSave.click()) :)

Start with the ones where you're calling that code from elsewhere. There should never be calls to event methods.

Tamar