Filling out some more stubbs.
Merging stuff.