committing so I can merge in Ted's branch.