I recommend leaving this for another PR