Pull notanuser's thing in here

I hope this works as I think it does.