Classes Set up

cleanup