Updated the config files a bit, and reworked how things are done