Chapter 5 addtions.

Some more additions from Chapter 5. Includes some "getters" and "setters".