Add class re-make

lots of crap