Well I got it back today and even thought it says they did some work on it, I still can't take a photo. Did they maybe test it out to see if it worked before shipping it back?
Luckily Canon support gave me their Purolator account so I don't have to spend another $7 to ship it back. It's next day service so hopefully they can take a look at it tomorrow.
Keep your fingers crossed.