Cleaned up unneeded code, added join command