Kfitz workingbranch

Filesystem complete, merging into main branch