Laid out some more functionality.