@ciaranmcnulty I think @l3l0 meant introducing Filesystem should be sent with a separate PR ;)