Up to episode 29.

Minor tweaks and updated encapsulation.