Updating main branch

Creating a pull request for commenting ability
These methods should only exist in one place.