WIP
Changes to config files to be used as a library