daveshap final commit