I'll leave that for another PR