Going to commit some of the minor modifications before I move a lot of the parse logic into the Configuration object.
Committing the changes to the Configuration object