Refactoring into config file WIP.