Finished updating the rest of the project with m-hume pull request updates