More moving of functionality to classes.