Yes, think are two thinks. Not sure about the best order, but merging this PR right now seems less work