Adding, merging Colm's Code from saturday 5-5-2014.