Added some functionality to the functions! eh