could you move this into a separate PR?  too much of different things in 1