Moved all my functions into the package from my file