Greg

Merging working branch into master