Filling out some more basics