almost done with class cluster I think