Amber's version of 13106 stage 2 proposal, with my edits made. Final version of 13010