Unification of two and one column versions

This now has the two column and the one column version both produced from the same branch, instead of being on separate branches.