First commit (belatedly) of source as of 19/4/13