Making changes in small manageable batches: - [x] Batch 1: - [x] #255 - [x] Batch 2: - [x] #465 - [x] #558 - [x] #560 - [x] #542