Made some changes. Currently attempting to add some error checking.
Merge origin/master
Made some changes. Currently attempting to add some error checking.