Why don't you clean up those Macros and turn them into real Code first?