Merge Commands into master

Not yet ready to merge, but good for the diff.