Commiting all changes needed to have this work well, and updating the Concept Document with slight improvements.