first go at moving staff client 2 trap hold logic to staff client 3