First commit of refactor to use ConfigParser