Bunch of changes to rejig the config - Now based on ini files.