Broke down the functionality a little bit
Broke down the functionality a little bit

magium/configuration-manager,kschroeder/configuration-manager,magium/configuration-manager,kschroeder/configuration-manager