Crudely merge further

Some of these last files weren't added with the last commit. Please
work.