removed some trailhead stuff and did some work toward making handlers only need a cw