Let the PAIN begin
Finish refactoring configuration. The PAIN is over for now