Stephen - added my stuff to last branch