Updated classes. Skeletons of a lot of methods.