Updated classes & added greeting