Initial commit with some config management code