Josh Ferge Fin

Finsihed before midnight forgot to make pull request, can look at screenshots to verify