Classes and some changes
More Changes!