Pre-merge, added other sections
Merge
Rough pass at quick coverage of verious adapters.