Changed up the config code, made internal names non-hardcoded