Added support for psf,dcd... maybe
Did a whole bunch of things that involve more than just the scope of
this branch. Oops.