MAJOR changes to make config usable across server and client