Working changes to things Jen was working on before David interrupted.
Merge branch 'jen'