Initial commit with docs from ben
fix merge