First commit on moving over from scutil