Initial commit using David's data as a basement