Working on surface commit