Config works now. Clean up main class (a lot) and move some stuff around..