Merge private clone to Grayson-Branch

just merging them