Finaly Pull Request

Added all the functionality that was presented to the class.