merged all commits. app runs now