Some previously uncommitted stuff. Needs cleaning up really.