Committing before major changes

These changes could potentially break the script (lol).  Want to have a
working version just in case that happens.