Addition from Jamie

Let's try merging a change.