Fixed errornous class declaratations. It's 3am.