futher refactorings
More refactoring of wif and replaced start with story
Changed how to works