move attrib and client stack onto the state