Re-adding all changes for this task to a separate branch.  They were previously on the master.