More structure building,comments, and calls