T's crossed and I's dotted.  Waiting on file manager fix