me redoing crap from last class...