Chug along with cookbook refactor, fix some errors in filestore. More needs done though.