This seems like it might belong in the addresses_controller, what do you think?