Let's un-hardcode things that should defintely not be hardcoded