diff --git a/.gitignore b/.gitignore
index 2e5d66a..8aaed60 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,5 +1,6 @@
 include
 bin
+conf.toml
 
 # ---> Python
 # Byte-compiled / optimized / DLL files
diff --git a/load_config.py b/load_config.py
index 211e1a6..b36a665 100644
--- a/load_config.py
+++ b/load_config.py
@@ -1,7 +1,5 @@
-import os
+import os, toml
 from dotenv import load_dotenv
 
-load_dotenv()
-
-flickr_key = os.getenv('FLICKR_KEY')
-flickr_secret = os.getenv('FLICKR_SECRET')
\ No newline at end of file
+config = toml.load("conf.toml")
+print(config)
\ No newline at end of file
diff --git a/main.py b/main.py
index 0e01f52..a7114c3 100644
--- a/main.py
+++ b/main.py
@@ -1,7 +1,5 @@
 import load_config
 import image_processing
-import load_config
-import publish_flickr
 
 import os, sys
 
@@ -38,8 +36,9 @@ def main():
             item_data = image_processing.get_image_data(item)
             file_data.append(item_data)
 
-        print(file_data)
-        publish_flickr.upload(file_data)
+        if load_config.config['flickr']['enable']:
+            import publish_flickr
+            publish_flickr.upload(file_data)
         
 def list_files_in_directory(directory):
     top_level_items = os.listdir(directory)
diff --git a/publish_flickr.py b/publish_flickr.py
index 0840ba0..c24f30f 100644
--- a/publish_flickr.py
+++ b/publish_flickr.py
@@ -2,7 +2,7 @@ import flickrapi
 import load_config
 
 print("Authenticating with Flickr")
-flickr = flickrapi.FlickrAPI(load_config.flickr_key, load_config.flickr_secret)
+flickr = flickrapi.FlickrAPI(load_config.config['flickr']['app_api'], load_config.config['flickr']['app_secret'])
 flickr.authenticate_via_browser(perms='write')
 
 def upload(file_data: list):
@@ -16,6 +16,7 @@ def upload(file_data: list):
             is_public = 1,
             format = 'rest'
         )
+    print("Uploading to Flickr")
 
 def prepareTags(input_list: list):
     output_list = []