Adding support for config
Final Stages Towards Completion