Final Version Pull Request

Below are the final version commits on my end.