Moved functions into .bash_functions