Initial commit plus modified cahier charge