moving stuff around to make the bayeux handler more gohy