PR for old stuff

Did this a while ago, should PR it