Do NOT merge: WIP — Feature/guide revisions