section 3.3 almost done, fixes #61