Added section 3.6 stubs, needs more