Update from Jay!

Err, I have been working on various elements for the best part of the
day!