First changes to get PhraseApp In place