Initial commit adding all from v1.1