Js dsc 242

gah, I deleted them in the wrong branch :(