Refs #26. Tweaking layout and wiring things back up.
Refs #26. Adding buffers.