Working on splitting off filesync system more so it can become optional