more work on the slide 12 layout and naming conventions