Added class exercises and changed some code