Merging This Branch

Matched to reqs. I’m going to check this tomorrow and tuesday, but it
looks good.