Arrgh - merge madness

finally recovering changes from macbook that were in duplicate folder