Work in progress adding config file support