updated branch; fold discussion of rejected version into a toggleable