OK. I screwed up my last commit so I'll add that in with my fix.