#4059 Inital commit of FS skeleton. Untested (not sure if it compiles well). Just fixes work in VCS