finish up WF class for now