Bleeding edge

merging into main directory