First draft of the configuration parser
merge changes