Step 1 update for new FAQ and Library

A multiple step forward in the background (w/o
Merge remote-tracking branch 'upstream/master'
arrangement based on Marty/John discussion