Adding some classes. I am redoing the thinking process so ya...