Updated configs, but it's still dirty! Need some work here