Initial version of config
Comment updates
Configuration refactor