Doc story

All of our changes merged, ready to be merged to master