Changing to the dsmryder branch

I'm working on stabilizing the code