Moved bash functions to seperate file, added a few new functions