Started filling in some of the stubs.