Hooray for the extern keyword in fixing things