Initial changes to be compatible with new DOF interface, committing to save...

Initial changes to be compatible with new DOF interface, committing to save work (only halfway done)