Adding, merging Luke's Code from saturday 5-5-2014. Some more formatting and cleanup.