mega improvement of class and images and much more!!