Much better config settings.  Adding support for files and notebooks