Updating a lot of the features from before the recent wave of refactoring.