Added CWD functionality!