First trial commit

Parts of 1a