Settings are now stored in the database
Added organization