Significant work on FS subsystem