merge prep
Ben's updates integrated; grappler now highlights green over button