Move some agent stuff around