Fixes to my earlier push.

This adds the files that didn't get added to the last pull request.
Turns out I had the creation in the wrong commits.