Now using classForCoder to get rid of some nasty hacking