CD and white space working

yay!!