Finished functionality
Merge branch 'master' of https://github.com/KyleBurger/MXEugeneCapstone