All user vars moved to params. Options in place for integration type and time-stepping routine.