(nearly) all from page 24
add foldmarkers
stubs from page 26
wip