Committing Week 3 changes

The Error catching on this is SHIT. DEAL WITH IT. I'LL FIX IT LATER.