Merging the testing_update branch

Made changes on a separate branch so that I didn't disrupt the master branch in case of change from someone else. I am merging my testing branch with the master branch now since it's the end of the night, and no other changes have been made. I will keep this branch around though for future changes, and to reference what I have done.