Work on the Filesystem aspects. More UI work