arugh you're just doing the work from my PR now :( now i'll have to deal with conflicts I'm sure