- More sortibg out of the setup scripts.