Update

Sectioning and tests and helper methods.