trinity r20140717

WIP