get rid of all the class crap replace with good stuf