kinda of done
Merge branch 'jacob' of https://github.com/mcafeeryan92/codegoggles into jacob