First attempt to handle pickup locations via config file.
Accidentally added files in last commit