closes #349 added application level config
CR updates
CR updates
WIP
WIP