adding begin/end markers, removing the debug poop