Wip fs cmds

Probably more defensive to use the function you added in a later commit.