Progress, need to rewrite fsh, vsh files, should work