Work in progress
add config options to god and refactor
Merge branch 'god'