Refracted the classes and expanded them more.