Addded some content to John's branch