added functions to the original functionality
Merge branch 'master' of https://github.com/RyanRedhead/Lab6