we're still on version 16. 17 changes a few things that I didn't want to add to the already massive PR, but we should tackle it afterwards