Opdconfig

Moved the work from my repo into new branch for testing on dev