Complete Configuration Rewrite

Change-Id: Id3d98c44317933d3c0574d73b0acd9227388225b