cjrh combinededits

making #85 (from @cjrh) mergeable since the restructure of the advanced section