initial commit
nearly there on 1.2