Crude implementation of #3 in fsDiff done - need to polish more, add corresponding files inside fs