Starting configurability functionality
More progress
Merging in master
Configurabilityyyyy