More work towards working filesystem