App initial commit (take 3)